Browse Source

Fix build/include_alpha linter violations in brightray

Kevin Sawicki 8 years ago
parent
commit
c4608c0f37

+ 1 - 1
brightray/CPPLINT.cfg

@@ -1 +1 @@
-filter=-legal/copyright
+filter=-legal/copyright,+build/include_alpha

+ 4 - 7
brightray/browser/browser_context.cc

@@ -4,24 +4,21 @@
 
 #include "browser/browser_context.h"
 
-#include "browser/media/media_device_id_salt.h"
+#include "base/files/file_path.h"
+#include "base/path_service.h"
+#include "base/strings/string_util.h"
 #include "browser/brightray_paths.h"
 #include "browser/browser_client.h"
 #include "browser/inspectable_web_contents_impl.h"
+#include "browser/media/media_device_id_salt.h"
 #include "browser/network_delegate.h"
 #include "browser/special_storage_policy.h"
 #include "browser/zoom_level_delegate.h"
 #include "common/application_info.h"
-
-#include "base/files/file_path.h"
-#include "base/path_service.h"
-
 #include "components/prefs/json_pref_store.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
 #include "components/prefs/pref_service_factory.h"
-
-#include "base/strings/string_util.h"
 #include "content/browser/streams/stream_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/resource_context.h"

+ 2 - 3
brightray/browser/browser_context.h

@@ -8,12 +8,11 @@
 #include <map>
 #include <string>
 
+#include "base/memory/ref_counted.h"
+#include "base/memory/weak_ptr.h"
 #include "browser/net/devtools_network_controller_handle.h"
 #include "browser/permission_manager.h"
 #include "browser/url_request_context_getter.h"
-
-#include "base/memory/ref_counted.h"
-#include "base/memory/weak_ptr.h"
 #include "content/public/browser/browser_context.h"
 
 class PrefRegistrySimple;

+ 1 - 1
brightray/browser/browser_main_parts.cc

@@ -33,8 +33,8 @@
 
 #if defined(USE_X11)
 #include "base/environment.h"
-#include "base/path_service.h"
 #include "base/nix/xdg_util.h"
+#include "base/path_service.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "browser/brightray_paths.h"
 #include "chrome/browser/ui/libgtkui/gtk_ui.h"

+ 2 - 4
brightray/browser/devtools_manager_delegate.cc

@@ -6,14 +6,13 @@
 
 #include <vector>
 
-#include "browser/net/devtools_network_protocol_handler.h"
-
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
+#include "browser/net/devtools_network_protocol_handler.h"
 #include "common/content_client.h"
 #include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/devtools_frontend_host.h"
@@ -25,11 +24,10 @@
 #include "content/public/common/user_agent.h"
 #include "content/shell/grit/shell_resources.h"
 #include "net/base/net_errors.h"
-#include "net/socket/tcp_server_socket.h"
 #include "net/socket/stream_socket.h"
+#include "net/socket/tcp_server_socket.h"
 #include "ui/base/resource/resource_bundle.h"
 
-
 namespace brightray {
 
 namespace {

+ 1 - 1
brightray/browser/devtools_manager_delegate.h

@@ -7,8 +7,8 @@
 
 #include <string>
 
-#include "base/macros.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "content/public/browser/devtools_manager_delegate.h"
 
 namespace brightray {

+ 1 - 1
brightray/browser/inspectable_web_contents_impl.cc

@@ -18,9 +18,9 @@
 #include "browser/inspectable_web_contents_delegate.h"
 #include "browser/inspectable_web_contents_view.h"
 #include "browser/inspectable_web_contents_view_delegate.h"
+#include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
 #include "components/prefs/scoped_user_pref_update.h"
-#include "components/prefs/pref_registry_simple.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/host_zoom_map.h"
 #include "content/public/browser/render_frame_host.h"

+ 2 - 4
brightray/browser/inspectable_web_contents_impl.h

@@ -10,12 +10,10 @@
 #include <string>
 #include <vector>
 
-#include "browser/inspectable_web_contents.h"
-
+#include "base/memory/weak_ptr.h"
 #include "browser/devtools_contents_resizing_strategy.h"
 #include "browser/devtools_embedder_message_dispatcher.h"
-
-#include "base/memory/weak_ptr.h"
+#include "browser/inspectable_web_contents.h"
 #include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/devtools_frontend_host.h"
 #include "content/public/browser/web_contents_delegate.h"

+ 0 - 1
brightray/browser/linux/libnotify_loader.h

@@ -6,7 +6,6 @@
 #define BRIGHTRAY_BROWSER_LINUX_LIBNOTIFY_LOADER_H_
 
 #include <libnotify/notify.h>
-
 #include <string>
 
 class LibNotifyLoader {

+ 1 - 2
brightray/browser/mac/bry_inspectable_web_contents_view.h

@@ -1,8 +1,7 @@
 #import <AppKit/AppKit.h>
 
-#include "browser/devtools_contents_resizing_strategy.h"
-
 #include "base/mac/scoped_nsobject.h"
+#include "browser/devtools_contents_resizing_strategy.h"
 #include "ui/base/cocoa/base_view.h"
 
 namespace brightray {

+ 0 - 1
brightray/browser/mac/bry_inspectable_web_contents_view.mm

@@ -4,7 +4,6 @@
 #include "browser/inspectable_web_contents_view_delegate.h"
 #include "browser/inspectable_web_contents_view_mac.h"
 #include "browser/mac/event_dispatching_window.h"
-
 #include "content/public/browser/render_widget_host_view.h"
 #include "ui/gfx/mac/scoped_cocoa_disable_screen_updates.h"
 

+ 0 - 1
brightray/browser/media/media_stream_devices_controller.cc

@@ -5,7 +5,6 @@
 #include "browser/media/media_stream_devices_controller.h"
 
 #include "browser/media/media_capture_devices_dispatcher.h"
-
 #include "content/public/browser/desktop_media_id.h"
 #include "content/public/common/media_stream_request.h"
 

+ 1 - 2
brightray/browser/net/devtools_network_controller.cc

@@ -4,11 +4,10 @@
 
 #include "browser/net/devtools_network_controller.h"
 
+#include "base/bind.h"
 #include "browser/net/devtools_network_conditions.h"
 #include "browser/net/devtools_network_interceptor.h"
 #include "browser/net/devtools_network_transaction.h"
-
-#include "base/bind.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;

+ 1 - 1
brightray/browser/net/devtools_network_controller.h

@@ -5,9 +5,9 @@
 #ifndef BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_CONTROLLER_H_
 #define BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_CONTROLLER_H_
 
-#include <unordered_map>
 #include <memory>
 #include <string>
+#include <unordered_map>
 
 #include "base/macros.h"
 #include "base/threading/thread_checker.h"

+ 1 - 2
brightray/browser/net/devtools_network_protocol_handler.cc

@@ -6,11 +6,10 @@
 
 #include <string>
 
+#include "base/strings/stringprintf.h"
 #include "browser/browser_context.h"
 #include "browser/net/devtools_network_conditions.h"
 #include "browser/net/devtools_network_controller.h"
-
-#include "base/strings/stringprintf.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/devtools_agent_host.h"
 

+ 0 - 1
brightray/browser/net/devtools_network_transaction_factory.cc

@@ -9,7 +9,6 @@
 
 #include "browser/net/devtools_network_controller.h"
 #include "browser/net/devtools_network_transaction.h"
-
 #include "content/public/browser/service_worker_context.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_network_layer.h"

+ 1 - 1
brightray/browser/platform_notification_service.cc

@@ -8,8 +8,8 @@
 #include "browser/notification.h"
 #include "browser/notification_delegate_adapter.h"
 #include "browser/notification_presenter.h"
-#include "content/public/common/platform_notification_data.h"
 #include "content/public/common/notification_resources.h"
+#include "content/public/common/platform_notification_data.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace brightray {

+ 7 - 8
brightray/browser/url_request_context_getter.cc

@@ -6,18 +6,17 @@
 
 #include <algorithm>
 
-#include "browser/net/devtools_network_controller_handle.h"
-#include "browser/net/devtools_network_transaction_factory.h"
-#include "browser/net_log.h"
-#include "browser/network_delegate.h"
-#include "common/switches.h"
-
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
-#include "base/strings/string_util.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/strings/string_util.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/threading/worker_pool.h"
+#include "browser/net/devtools_network_controller_handle.h"
+#include "browser/net/devtools_network_transaction_factory.h"
+#include "browser/net_log.h"
+#include "browser/network_delegate.h"
+#include "common/switches.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/cookie_store_factory.h"
 #include "content/public/common/content_switches.h"
@@ -51,9 +50,9 @@
 #include "net/url_request/url_request_context_storage.h"
 #include "net/url_request/url_request_intercepting_job_factory.h"
 #include "net/url_request/url_request_job_factory_impl.h"
+#include "storage/browser/quota/special_storage_policy.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "url/url_constants.h"
-#include "storage/browser/quota/special_storage_policy.h"
 
 #if defined(USE_NSS_CERTS)
 #include "net/cert_net/nss_ocsp.h"

+ 1 - 1
brightray/browser/web_ui_controller_factory.cc

@@ -4,8 +4,8 @@
 
 #include "browser/web_ui_controller_factory.h"
 
-#include "browser/devtools_ui.h"
 #include "base/memory/singleton.h"
+#include "browser/devtools_ui.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/common/url_constants.h"

+ 1 - 1
brightray/browser/win/windows_toast_notification.cc

@@ -12,8 +12,8 @@
 
 #include "base/strings/utf_string_conversions.h"
 #include "browser/notification_delegate.h"
-#include "browser/win/scoped_hstring.h"
 #include "browser/win/notification_presenter_win.h"
+#include "browser/win/scoped_hstring.h"
 #include "common/application_info.h"
 #include "content/public/browser/browser_thread.h"
 

+ 1 - 2
brightray/common/application_info_mac.mm

@@ -1,9 +1,8 @@
 #import "common/application_info.h"
 
 #import "base/mac/foundation_util.h"
-#import "common/mac/main_application_bundle.h"
-
 #import "base/strings/sys_string_conversions.h"
+#import "common/mac/main_application_bundle.h"
 
 namespace brightray {
 

+ 2 - 2
brightray/common/application_info_win.cc

@@ -1,7 +1,7 @@
-#include <memory>
-
 #include "common/application_info.h"
 
+#include <memory>
+
 #include "base/file_version_info.h"
 #include "base/strings/utf_string_conversions.h"
 

+ 1 - 1
brightray/common/content_client.cc

@@ -4,8 +4,8 @@
 
 #include "common/content_client.h"
 
-#include "base/strings/stringprintf.h"
 #include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "common/application_info.h"
 #include "content/public/common/user_agent.h"
 #include "ui/base/l10n/l10n_util.h"

+ 2 - 3
brightray/common/main_delegate.cc

@@ -6,11 +6,10 @@
 
 #include <memory>
 
-#include "browser/browser_client.h"
-#include "common/content_client.h"
-
 #include "base/command_line.h"
 #include "base/path_service.h"
+#include "browser/browser_client.h"
+#include "common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_switches.h"

+ 3 - 3
brightray/common/main_delegate_mac.mm

@@ -5,15 +5,15 @@
 
 #import "main_delegate.h"
 
-#include "base/mac/foundation_util.h"
-#include "common/application_info.h"
-#include "common/mac/main_application_bundle.h"
 
 #include "base/command_line.h"
 #include "base/mac/bundle_locations.h"
+#include "base/mac/foundation_util.h"
 #include "base/path_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
+#include "common/application_info.h"
+#include "common/mac/main_application_bundle.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/common/content_switches.h"
 #include "ui/base/resource/resource_bundle.h"