From ca274f7be0dca936b05c321327fe603c90b68c0c Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 18 May 2017 13:37:32 -0700 Subject: [PATCH 01/16] Use kIgnoreCertificateErrors from content_switches.h --- brightray/browser/url_request_context_getter.cc | 2 +- brightray/common/switches.cc | 3 --- brightray/common/switches.h | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/brightray/browser/url_request_context_getter.cc b/brightray/browser/url_request_context_getter.cc index 209260ace1c3..c6045e34c059 100644 --- a/brightray/browser/url_request_context_getter.cc +++ b/brightray/browser/url_request_context_getter.cc @@ -307,7 +307,7 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() { network_session_params.enable_http2 = false; // --ignore-certificate-errors - if (command_line.HasSwitch(switches::kIgnoreCertificateErrors)) + if (command_line.HasSwitch(::switches::kIgnoreCertificateErrors)) network_session_params.ignore_certificate_errors = true; // --host-rules diff --git a/brightray/common/switches.cc b/brightray/common/switches.cc index 17ca05857739..fb281de82822 100644 --- a/brightray/common/switches.cc +++ b/brightray/common/switches.cc @@ -50,9 +50,6 @@ const char kAuthServerWhitelist[] = "auth-server-whitelist"; const char kAuthNegotiateDelegateWhitelist[] = "auth-negotiate-delegate-whitelist"; -// Ignores certificate-related errors. -const char kIgnoreCertificateErrors[] = "ignore-certificate-errors"; - // Forces the maximum disk space to be used by the disk cache, in bytes. const char kDiskCacheSize[] = "disk-cache-size"; diff --git a/brightray/common/switches.h b/brightray/common/switches.h index 286c4d633b91..6262f5f962ca 100644 --- a/brightray/common/switches.h +++ b/brightray/common/switches.h @@ -17,7 +17,6 @@ extern const char kProxyPacUrl[]; extern const char kDisableHttp2[]; extern const char kAuthServerWhitelist[]; extern const char kAuthNegotiateDelegateWhitelist[]; -extern const char kIgnoreCertificateErrors[]; extern const char kDiskCacheSize[]; } // namespace switches From c6190dc0946f58c9c80ee5715467effd7431ec67 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 18 May 2017 13:53:38 -0700 Subject: [PATCH 02/16] Remove unused BRYApplication class --- brightray/browser/mac/bry_application.h | 7 ------- brightray/browser/mac/bry_application.mm | 19 ------------------- brightray/filenames.gypi | 2 -- 3 files changed, 28 deletions(-) delete mode 100644 brightray/browser/mac/bry_application.h delete mode 100644 brightray/browser/mac/bry_application.mm diff --git a/brightray/browser/mac/bry_application.h b/brightray/browser/mac/bry_application.h deleted file mode 100644 index 98594861496b..000000000000 --- a/brightray/browser/mac/bry_application.h +++ /dev/null @@ -1,7 +0,0 @@ -#import "base/mac/scoped_sending_event.h" - -@interface BRYApplication : NSApplication { - BOOL _handlingSendEvent; -} - -@end diff --git a/brightray/browser/mac/bry_application.mm b/brightray/browser/mac/bry_application.mm deleted file mode 100644 index aca8392bc35c..000000000000 --- a/brightray/browser/mac/bry_application.mm +++ /dev/null @@ -1,19 +0,0 @@ -#import "bry_application.h" - -@interface BRYApplication () - -@property (nonatomic, assign, getter = isHandlingSendEvent) BOOL handlingSendEvent; - -@end - -@implementation BRYApplication - -@synthesize handlingSendEvent = _handlingSendEvent; - -- (void)sendEvent:(NSEvent *)theEvent -{ - base::mac::ScopedSendingEvent scopedSendingEvent; - [super sendEvent:theEvent]; -} - -@end diff --git a/brightray/filenames.gypi b/brightray/filenames.gypi index b7d44013b847..054e20a4bc6c 100644 --- a/brightray/filenames.gypi +++ b/brightray/filenames.gypi @@ -29,8 +29,6 @@ 'browser/inspectable_web_contents_view.h', 'browser/inspectable_web_contents_view_mac.h', 'browser/inspectable_web_contents_view_mac.mm', - 'browser/mac/bry_application.h', - 'browser/mac/bry_application.mm', 'browser/mac/bry_inspectable_web_contents_view.h', 'browser/mac/bry_inspectable_web_contents_view.mm', 'browser/mac/cocoa_notification.h', From 6e3a0b50ccdbab912c9d272a0caa0b15cea481e9 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 18 May 2017 13:54:11 -0700 Subject: [PATCH 03/16] Remove 10.8 foundation_util workaround --- brightray/common/application_info_mac.mm | 2 +- brightray/common/mac/foundation_util.h | 15 --------------- brightray/common/main_delegate_mac.mm | 2 +- brightray/filenames.gypi | 1 - 4 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 brightray/common/mac/foundation_util.h diff --git a/brightray/common/application_info_mac.mm b/brightray/common/application_info_mac.mm index 6898b6376deb..3bb4b377858d 100644 --- a/brightray/common/application_info_mac.mm +++ b/brightray/common/application_info_mac.mm @@ -1,6 +1,6 @@ #import "common/application_info.h" -#import "common/mac/foundation_util.h" +#import "base/mac/foundation_util.h" #import "common/mac/main_application_bundle.h" #import "base/strings/sys_string_conversions.h" diff --git a/brightray/common/mac/foundation_util.h b/brightray/common/mac/foundation_util.h deleted file mode 100644 index 3b7e6a66a95d..000000000000 --- a/brightray/common/mac/foundation_util.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef BRIGHTRAY_COMMON_MAC_FOUNDATION_UTIL_H_ -#define BRIGHTRAY_COMMON_MAC_FOUNDATION_UTIL_H_ - -// This header exists to work around incompatibilities between -// base/mac/foundation_util.h and the 10.8 SDK. - -#import - -// base/mac/foundation_util.h contains an incompatible declaration of -// NSSearchPathDirectory, so here we #define it to be something else. -#define NSSearchPathDirectory NSSearchPathDirectory___PRE_10_8 -#import "base/mac/foundation_util.h" -#undef NSSearchPathDirectory - -#endif diff --git a/brightray/common/main_delegate_mac.mm b/brightray/common/main_delegate_mac.mm index 29040840ce33..372ec15693c2 100644 --- a/brightray/common/main_delegate_mac.mm +++ b/brightray/common/main_delegate_mac.mm @@ -5,8 +5,8 @@ #import "main_delegate.h" +#include "base/mac/foundation_util.h" #include "common/application_info.h" -#include "common/mac/foundation_util.h" #include "common/mac/main_application_bundle.h" #include "base/command_line.h" diff --git a/brightray/filenames.gypi b/brightray/filenames.gypi index 054e20a4bc6c..f8f89ea94b6f 100644 --- a/brightray/filenames.gypi +++ b/brightray/filenames.gypi @@ -114,7 +114,6 @@ 'common/application_info_win.cc', 'common/content_client.cc', 'common/content_client.h', - 'common/mac/foundation_util.h', 'common/mac/main_application_bundle.h', 'common/mac/main_application_bundle.mm', 'common/main_delegate.cc', From bb4a61c7ff3df2c13a9a849d62336c862ac868a3 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 18 May 2017 14:30:32 -0700 Subject: [PATCH 04/16] Remove unused includes --- brightray/browser/brightray_paths.h | 2 -- brightray/browser/browser_client.h | 2 -- brightray/browser/browser_context.cc | 1 - brightray/browser/browser_main_parts.h | 2 +- brightray/browser/devtools_contents_resizing_strategy.h | 1 - brightray/browser/devtools_file_system_indexer.cc | 2 -- brightray/browser/devtools_manager_delegate.h | 1 - brightray/browser/inspectable_web_contents_impl.h | 4 ---- brightray/browser/media/media_capture_devices_dispatcher.h | 2 -- brightray/browser/media/media_device_id_salt.h | 1 - brightray/browser/media/media_stream_devices_controller.h | 2 -- brightray/browser/net/devtools_network_conditions.h | 4 ---- brightray/browser/net/devtools_network_transaction.h | 1 - brightray/browser/net/devtools_network_upload_data_stream.h | 1 - brightray/browser/network_delegate.h | 1 - 15 files changed, 1 insertion(+), 26 deletions(-) diff --git a/brightray/browser/brightray_paths.h b/brightray/browser/brightray_paths.h index 14c51ca8f229..c196757442a1 100644 --- a/brightray/browser/brightray_paths.h +++ b/brightray/browser/brightray_paths.h @@ -5,8 +5,6 @@ #ifndef BROWSER_BRIGHTRAY_PATHS_H_ #define BROWSER_BRIGHTRAY_PATHS_H_ -#include "base/compiler_specific.h" - #if defined(OS_WIN) #include "base/base_paths_win.h" #elif defined(OS_MACOSX) diff --git a/brightray/browser/browser_client.h b/brightray/browser/browser_client.h index 574103b91ca3..cd0380b404b2 100644 --- a/brightray/browser/browser_client.h +++ b/brightray/browser/browser_client.h @@ -6,12 +6,10 @@ #define BRIGHTRAY_BROWSER_BROWSER_CLIENT_H_ #include "browser/net_log.h" -#include "content/public/browser/browser_context.h" #include "content/public/browser/content_browser_client.h" namespace brightray { -class BrowserContext; class BrowserMainParts; class NotificationPresenter; class PlatformNotificationService; diff --git a/brightray/browser/browser_context.cc b/brightray/browser/browser_context.cc index 88e8bd40848a..e4b7fd4d1165 100644 --- a/brightray/browser/browser_context.cc +++ b/brightray/browser/browser_context.cc @@ -9,7 +9,6 @@ #include "browser/browser_client.h" #include "browser/inspectable_web_contents_impl.h" #include "browser/network_delegate.h" -#include "browser/permission_manager.h" #include "browser/special_storage_policy.h" #include "browser/zoom_level_delegate.h" #include "common/application_info.h" diff --git a/brightray/browser/browser_main_parts.h b/brightray/browser/browser_main_parts.h index ab9b086d786b..4bc2a85e462b 100644 --- a/brightray/browser/browser_main_parts.h +++ b/brightray/browser/browser_main_parts.h @@ -6,7 +6,7 @@ #define BRIGHTRAY_BROWSER_BROWSER_MAIN_PARTS_H_ #include "base/compiler_specific.h" -#include "base/memory/ref_counted.h" +#include "base/macros.h" #include "content/public/browser/browser_main_parts.h" #if defined(TOOLKIT_VIEWS) diff --git a/brightray/browser/devtools_contents_resizing_strategy.h b/brightray/browser/devtools_contents_resizing_strategy.h index c48272f79774..e3fcb27c6ba8 100644 --- a/brightray/browser/devtools_contents_resizing_strategy.h +++ b/brightray/browser/devtools_contents_resizing_strategy.h @@ -6,7 +6,6 @@ #define BRIGHTRAY_BROWSER_DEVTOOLS_CONTENTS_RESIZING_STRATEGY_H_ #include "base/macros.h" -#include "ui/gfx/geometry/insets.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/size.h" diff --git a/brightray/browser/devtools_file_system_indexer.cc b/brightray/browser/devtools_file_system_indexer.cc index e41830258fdc..5217810a5779 100644 --- a/brightray/browser/devtools_file_system_indexer.cc +++ b/brightray/browser/devtools_file_system_indexer.cc @@ -9,13 +9,11 @@ #include #include "base/bind.h" -#include "base/callback.h" #include "base/files/file_enumerator.h" #include "base/files/file_util.h" #include "base/files/file_util_proxy.h" #include "base/lazy_instance.h" #include "base/logging.h" -#include "base/macros.h" #include "base/stl_util.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" diff --git a/brightray/browser/devtools_manager_delegate.h b/brightray/browser/devtools_manager_delegate.h index 2e2e09f43f5c..8ebc27b7b4c1 100644 --- a/brightray/browser/devtools_manager_delegate.h +++ b/brightray/browser/devtools_manager_delegate.h @@ -7,7 +7,6 @@ #include "base/macros.h" #include "base/compiler_specific.h" -#include "content/browser/devtools/devtools_http_handler.h" #include "content/public/browser/devtools_manager_delegate.h" namespace brightray { diff --git a/brightray/browser/inspectable_web_contents_impl.h b/brightray/browser/inspectable_web_contents_impl.h index 25cffa957aff..0da69acb5be1 100644 --- a/brightray/browser/inspectable_web_contents_impl.h +++ b/brightray/browser/inspectable_web_contents_impl.h @@ -22,10 +22,6 @@ class PrefService; class PrefRegistrySimple; -namespace content { -class DevToolsAgentHost; -} - namespace brightray { class InspectableWebContentsDelegate; diff --git a/brightray/browser/media/media_capture_devices_dispatcher.h b/brightray/browser/media/media_capture_devices_dispatcher.h index dbbd66d25800..b64596092a5c 100644 --- a/brightray/browser/media/media_capture_devices_dispatcher.h +++ b/brightray/browser/media/media_capture_devices_dispatcher.h @@ -5,10 +5,8 @@ #ifndef BRIGHTRAY_BROWSER_MEDIA_MEDIA_CAPTURE_DEVICES_DISPATCHER_H_ #define BRIGHTRAY_BROWSER_MEDIA_MEDIA_CAPTURE_DEVICES_DISPATCHER_H_ -#include "base/callback.h" #include "base/memory/singleton.h" #include "content/public/browser/media_observer.h" -#include "content/public/browser/web_contents_delegate.h" #include "content/public/common/media_stream_request.h" namespace brightray { diff --git a/brightray/browser/media/media_device_id_salt.h b/brightray/browser/media/media_device_id_salt.h index 7941af8a563d..6162f4bd870b 100644 --- a/brightray/browser/media/media_device_id_salt.h +++ b/brightray/browser/media/media_device_id_salt.h @@ -8,7 +8,6 @@ #include #include "base/macros.h" -#include "base/memory/ref_counted.h" #include "components/prefs/pref_member.h" class PrefRegistrySimple; diff --git a/brightray/browser/media/media_stream_devices_controller.h b/brightray/browser/media/media_stream_devices_controller.h index 47aacfb66b64..de16e6cc94ef 100644 --- a/brightray/browser/media/media_stream_devices_controller.h +++ b/brightray/browser/media/media_stream_devices_controller.h @@ -5,8 +5,6 @@ #ifndef BRIGHTRAY_BROWSER_MEDIA_MEDIA_STREAM_DEVICES_CONTROLLER_H_ #define BRIGHTRAY_BROWSER_MEDIA_MEDIA_STREAM_DEVICES_CONTROLLER_H_ -#include - #include "content/public/browser/web_contents_delegate.h" namespace brightray { diff --git a/brightray/browser/net/devtools_network_conditions.h b/brightray/browser/net/devtools_network_conditions.h index 81aae86f8d49..12acdc8bd4ff 100644 --- a/brightray/browser/net/devtools_network_conditions.h +++ b/brightray/browser/net/devtools_network_conditions.h @@ -5,11 +5,7 @@ #ifndef BROWSER_DEVTOOLS_NETWORK_CONDITIONS_H_ #define BROWSER_DEVTOOLS_NETWORK_CONDITIONS_H_ -#include -#include - #include "base/macros.h" -#include "url/gurl.h" namespace brightray { diff --git a/brightray/browser/net/devtools_network_transaction.h b/brightray/browser/net/devtools_network_transaction.h index 7f01d73cad1e..707755f724b5 100644 --- a/brightray/browser/net/devtools_network_transaction.h +++ b/brightray/browser/net/devtools_network_transaction.h @@ -13,7 +13,6 @@ #include "net/base/load_states.h" #include "net/base/request_priority.h" #include "net/http/http_transaction.h" -#include "net/websockets/websocket_handshake_stream_base.h" namespace brightray { diff --git a/brightray/browser/net/devtools_network_upload_data_stream.h b/brightray/browser/net/devtools_network_upload_data_stream.h index c3753e8286f5..da697374d9ec 100644 --- a/brightray/browser/net/devtools_network_upload_data_stream.h +++ b/brightray/browser/net/devtools_network_upload_data_stream.h @@ -10,7 +10,6 @@ #include "base/macros.h" #include "base/memory/weak_ptr.h" #include "browser/net/devtools_network_interceptor.h" -#include "net/base/completion_callback.h" #include "net/base/upload_data_stream.h" namespace brightray { diff --git a/brightray/browser/network_delegate.h b/brightray/browser/network_delegate.h index b8a8b5225368..3ab3b49700ff 100644 --- a/brightray/browser/network_delegate.h +++ b/brightray/browser/network_delegate.h @@ -9,7 +9,6 @@ #include #include "net/base/network_delegate.h" -#include "net/proxy/proxy_server.h" namespace brightray { From cfb5b6ac8983cc90b2b85e43d5ea21f42178f681 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 18 May 2017 15:05:25 -0700 Subject: [PATCH 05/16] Fix build/header_guard linter violations in brightray --- brightray/CPPLINT.cfg | 2 +- brightray/browser/brightray_paths.h | 6 +++--- brightray/browser/browser_client.h | 2 +- brightray/browser/browser_context.h | 2 +- brightray/browser/browser_main_parts.h | 2 +- brightray/browser/devtools_file_system_indexer.h | 6 +++--- brightray/browser/devtools_manager_delegate.h | 6 +++--- brightray/browser/devtools_ui.h | 2 +- brightray/browser/inspectable_web_contents.h | 6 +++--- brightray/browser/inspectable_web_contents_delegate.h | 6 +++--- brightray/browser/inspectable_web_contents_impl.h | 2 +- brightray/browser/inspectable_web_contents_view.h | 2 +- .../browser/inspectable_web_contents_view_delegate.h | 6 +++--- brightray/browser/inspectable_web_contents_view_mac.h | 2 +- brightray/browser/linux/libnotify_notification.h | 6 +++--- brightray/browser/linux/notification_presenter_linux.h | 6 +++--- brightray/browser/mac/cocoa_notification.h | 6 +++--- brightray/browser/mac/notification_presenter_mac.h | 6 +++--- brightray/browser/net/devtools_network_conditions.h | 6 +++--- brightray/browser/net/devtools_network_controller.h | 6 +++--- .../browser/net/devtools_network_controller_handle.h | 6 +++--- brightray/browser/net/devtools_network_interceptor.h | 6 +++--- brightray/browser/net/devtools_network_protocol_handler.h | 6 +++--- brightray/browser/net/devtools_network_transaction.h | 6 +++--- .../browser/net/devtools_network_transaction_factory.h | 6 +++--- .../browser/net/devtools_network_upload_data_stream.h | 6 +++--- brightray/browser/net_log.h | 6 +++--- brightray/browser/network_delegate.h | 2 +- brightray/browser/notification.h | 6 +++--- brightray/browser/notification_delegate.h | 6 +++--- brightray/browser/notification_delegate_adapter.h | 6 +++--- brightray/browser/notification_presenter.h | 2 +- brightray/browser/permission_manager.h | 6 +++--- brightray/browser/platform_notification_service.h | 6 +++--- brightray/browser/url_request_context_getter.h | 2 +- brightray/browser/web_ui_controller_factory.h | 2 +- brightray/common/application_info.h | 2 +- brightray/common/content_client.h | 2 +- brightray/common/mac/main_application_bundle.h | 2 +- brightray/common/main_delegate.h | 3 ++- script/cpplint.py | 8 +++++++- 41 files changed, 96 insertions(+), 89 deletions(-) diff --git a/brightray/CPPLINT.cfg b/brightray/CPPLINT.cfg index 01e99482f2b0..1e4a4e6de3aa 100644 --- a/brightray/CPPLINT.cfg +++ b/brightray/CPPLINT.cfg @@ -1 +1 @@ -filter=-build/header_guard,-build/include_what_you_use,-legal/copyright,-runtime/references +filter=-build/include_what_you_use,-legal/copyright,-runtime/references diff --git a/brightray/browser/brightray_paths.h b/brightray/browser/brightray_paths.h index c196757442a1..b12b10d08f3c 100644 --- a/brightray/browser/brightray_paths.h +++ b/brightray/browser/brightray_paths.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BROWSER_BRIGHTRAY_PATHS_H_ -#define BROWSER_BRIGHTRAY_PATHS_H_ +#ifndef BRIGHTRAY_BROWSER_BRIGHTRAY_PATHS_H_ +#define BRIGHTRAY_BROWSER_BRIGHTRAY_PATHS_H_ #if defined(OS_WIN) #include "base/base_paths_win.h" @@ -40,4 +40,4 @@ enum { } // namespace brightray -#endif // BROWSER_BRIGHTRAY_PATHS_H_ +#endif // BRIGHTRAY_BROWSER_BRIGHTRAY_PATHS_H_ diff --git a/brightray/browser/browser_client.h b/brightray/browser/browser_client.h index cd0380b404b2..4426de839298 100644 --- a/brightray/browser/browser_client.h +++ b/brightray/browser/browser_client.h @@ -64,4 +64,4 @@ class BrowserClient : public content::ContentBrowserClient { } // namespace brightray -#endif +#endif // BRIGHTRAY_BROWSER_BROWSER_CLIENT_H_ diff --git a/brightray/browser/browser_context.h b/brightray/browser/browser_context.h index 704cfb9f33c6..f533c73f1c42 100644 --- a/brightray/browser/browser_context.h +++ b/brightray/browser/browser_context.h @@ -140,4 +140,4 @@ class BrowserContext : public base::RefCounted, } // namespace brightray -#endif +#endif // BRIGHTRAY_BROWSER_BROWSER_CONTEXT_H_ diff --git a/brightray/browser/browser_main_parts.h b/brightray/browser/browser_main_parts.h index 4bc2a85e462b..42b49923d2fb 100644 --- a/brightray/browser/browser_main_parts.h +++ b/brightray/browser/browser_main_parts.h @@ -57,4 +57,4 @@ class BrowserMainParts : public content::BrowserMainParts { } // namespace brightray -#endif +#endif // BRIGHTRAY_BROWSER_BROWSER_MAIN_PARTS_H_ diff --git a/brightray/browser/devtools_file_system_indexer.h b/brightray/browser/devtools_file_system_indexer.h index bb1acefab52a..49e5f4b4c147 100644 --- a/brightray/browser/devtools_file_system_indexer.h +++ b/brightray/browser/devtools_file_system_indexer.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BROWSER_DEVTOOLS_FILE_SYSTEM_INDEXER_H_ -#define BROWSER_DEVTOOLS_FILE_SYSTEM_INDEXER_H_ +#ifndef BRIGHTRAY_BROWSER_DEVTOOLS_FILE_SYSTEM_INDEXER_H_ +#define BRIGHTRAY_BROWSER_DEVTOOLS_FILE_SYSTEM_INDEXER_H_ #include @@ -112,4 +112,4 @@ class DevToolsFileSystemIndexer } // namespace brightray -#endif // BROWSER_DEVTOOLS_FILE_SYSTEM_INDEXER_H_ +#endif // BRIGHTRAY_BROWSER_DEVTOOLS_FILE_SYSTEM_INDEXER_H_ diff --git a/brightray/browser/devtools_manager_delegate.h b/brightray/browser/devtools_manager_delegate.h index 8ebc27b7b4c1..e351b06c25cc 100644 --- a/brightray/browser/devtools_manager_delegate.h +++ b/brightray/browser/devtools_manager_delegate.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#ifndef BROWSER_DEVTOOLS_MANAGER_DELEGATE_H_ -#define BROWSER_DEVTOOLS_MANAGER_DELEGATE_H_ +#ifndef BRIGHTRAY_BROWSER_DEVTOOLS_MANAGER_DELEGATE_H_ +#define BRIGHTRAY_BROWSER_DEVTOOLS_MANAGER_DELEGATE_H_ #include "base/macros.h" #include "base/compiler_specific.h" @@ -38,4 +38,4 @@ class DevToolsManagerDelegate : public content::DevToolsManagerDelegate { } // namespace brightray -#endif // BROWSER_DEVTOOLS_MANAGER_DELEGATE_H_ +#endif // BRIGHTRAY_BROWSER_DEVTOOLS_MANAGER_DELEGATE_H_ diff --git a/brightray/browser/devtools_ui.h b/brightray/browser/devtools_ui.h index 176de9b71bad..eb78fdf2a780 100644 --- a/brightray/browser/devtools_ui.h +++ b/brightray/browser/devtools_ui.h @@ -24,4 +24,4 @@ class DevToolsUI : public content::WebUIController { } // namespace brightray -#endif +#endif // BRIGHTRAY_BROWSER_DEVTOOLS_UI_H_ diff --git a/brightray/browser/inspectable_web_contents.h b/brightray/browser/inspectable_web_contents.h index 44c0c22ec647..3b717a2b5f5a 100644 --- a/brightray/browser/inspectable_web_contents.h +++ b/brightray/browser/inspectable_web_contents.h @@ -1,5 +1,5 @@ -#ifndef BRIGHTRAY_INSPECTABLE_WEB_CONTENTS_H_ -#define BRIGHTRAY_INSPECTABLE_WEB_CONTENTS_H_ +#ifndef BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_H_ +#define BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_H_ #include "content/public/browser/web_contents.h" @@ -50,4 +50,4 @@ class InspectableWebContents { } // namespace brightray -#endif +#endif // BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_H_ diff --git a/brightray/browser/inspectable_web_contents_delegate.h b/brightray/browser/inspectable_web_contents_delegate.h index a94bcac44d52..85a05dbe3876 100644 --- a/brightray/browser/inspectable_web_contents_delegate.h +++ b/brightray/browser/inspectable_web_contents_delegate.h @@ -1,5 +1,5 @@ -#ifndef BRIGHTRAY_INSPECTABLE_WEB_CONTENTS_DELEGATE_H_ -#define BRIGHTRAY_INSPECTABLE_WEB_CONTENTS_DELEGATE_H_ +#ifndef BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_DELEGATE_H_ +#define BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_DELEGATE_H_ #include @@ -31,4 +31,4 @@ class InspectableWebContentsDelegate { } // namespace brightray -#endif // BRIGHTRAY_INSPECTABLE_WEB_CONTENTS_DELEGATE_H_ +#endif // BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_DELEGATE_H_ diff --git a/brightray/browser/inspectable_web_contents_impl.h b/brightray/browser/inspectable_web_contents_impl.h index 0da69acb5be1..288f6119c44e 100644 --- a/brightray/browser/inspectable_web_contents_impl.h +++ b/brightray/browser/inspectable_web_contents_impl.h @@ -195,4 +195,4 @@ class InspectableWebContentsImpl : } // namespace brightray -#endif +#endif // BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_IMPL_H_ diff --git a/brightray/browser/inspectable_web_contents_view.h b/brightray/browser/inspectable_web_contents_view.h index 2fabf5d2ba30..480515ef4c2b 100644 --- a/brightray/browser/inspectable_web_contents_view.h +++ b/brightray/browser/inspectable_web_contents_view.h @@ -56,4 +56,4 @@ class InspectableWebContentsView { } // namespace brightray -#endif +#endif // BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_VIEW_H_ diff --git a/brightray/browser/inspectable_web_contents_view_delegate.h b/brightray/browser/inspectable_web_contents_view_delegate.h index 900857c7a108..7992c3830b14 100644 --- a/brightray/browser/inspectable_web_contents_view_delegate.h +++ b/brightray/browser/inspectable_web_contents_view_delegate.h @@ -1,5 +1,5 @@ -#ifndef BROWSER_INSPECTABLE_WEB_CONTENTS_VIEW_DELEGATE_H_ -#define BROWSER_INSPECTABLE_WEB_CONTENTS_VIEW_DELEGATE_H_ +#ifndef BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_VIEW_DELEGATE_H_ +#define BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_VIEW_DELEGATE_H_ #include "ui/gfx/image/image_skia.h" @@ -25,4 +25,4 @@ class InspectableWebContentsViewDelegate { } // namespace brightray -#endif // BROWSER_INSPECTABLE_WEB_CONTENTS_VIEW_DELEGATE_H_ +#endif // BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_VIEW_DELEGATE_H_ diff --git a/brightray/browser/inspectable_web_contents_view_mac.h b/brightray/browser/inspectable_web_contents_view_mac.h index e7ad57fbee8c..8d6d7b23a471 100644 --- a/brightray/browser/inspectable_web_contents_view_mac.h +++ b/brightray/browser/inspectable_web_contents_view_mac.h @@ -42,4 +42,4 @@ class InspectableWebContentsViewMac : public InspectableWebContentsView { } // namespace brightray -#endif +#endif // BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_VIEW_MAC_H_ diff --git a/brightray/browser/linux/libnotify_notification.h b/brightray/browser/linux/libnotify_notification.h index cb9384cb0e0c..41633f54b66b 100644 --- a/brightray/browser/linux/libnotify_notification.h +++ b/brightray/browser/linux/libnotify_notification.h @@ -2,8 +2,8 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#ifndef BROWSER_LINUX_LIBNOTIFY_NOTIFICATION_H_ -#define BROWSER_LINUX_LIBNOTIFY_NOTIFICATION_H_ +#ifndef BRIGHTRAY_BROWSER_LINUX_LIBNOTIFY_NOTIFICATION_H_ +#define BRIGHTRAY_BROWSER_LINUX_LIBNOTIFY_NOTIFICATION_H_ #include "browser/linux/libnotify_loader.h" #include "browser/notification.h" @@ -41,4 +41,4 @@ class LibnotifyNotification : public Notification { } // namespace brightray -#endif // BROWSER_LINUX_LIBNOTIFY_NOTIFICATION_H_ +#endif // BRIGHTRAY_BROWSER_LINUX_LIBNOTIFY_NOTIFICATION_H_ diff --git a/brightray/browser/linux/notification_presenter_linux.h b/brightray/browser/linux/notification_presenter_linux.h index a90f31ea60ef..143717091d77 100644 --- a/brightray/browser/linux/notification_presenter_linux.h +++ b/brightray/browser/linux/notification_presenter_linux.h @@ -3,8 +3,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#ifndef BRIGHTRAY_BROWSER_NOTIFICATION_PRESENTER_LINUX_H_ -#define BRIGHTRAY_BROWSER_NOTIFICATION_PRESENTER_LINUX_H_ +#ifndef BRIGHTRAY_BROWSER_LINUX_NOTIFICATION_PRESENTER_LINUX_H_ +#define BRIGHTRAY_BROWSER_LINUX_NOTIFICATION_PRESENTER_LINUX_H_ #include "browser/notification_presenter.h" @@ -24,4 +24,4 @@ class NotificationPresenterLinux : public NotificationPresenter { } // namespace brightray -#endif +#endif // BRIGHTRAY_BROWSER_LINUX_NOTIFICATION_PRESENTER_LINUX_H_ diff --git a/brightray/browser/mac/cocoa_notification.h b/brightray/browser/mac/cocoa_notification.h index f6ec9e9da6b0..96b09c5da578 100644 --- a/brightray/browser/mac/cocoa_notification.h +++ b/brightray/browser/mac/cocoa_notification.h @@ -2,8 +2,8 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#ifndef BROWSER_MAC_COCOA_NOTIFICATION_H_ -#define BROWSER_MAC_COCOA_NOTIFICATION_H_ +#ifndef BRIGHTRAY_BROWSER_MAC_COCOA_NOTIFICATION_H_ +#define BRIGHTRAY_BROWSER_MAC_COCOA_NOTIFICATION_H_ #import @@ -39,4 +39,4 @@ class CocoaNotification : public Notification { } // namespace brightray -#endif // BROWSER_MAC_COCOA_NOTIFICATION_H_ +#endif // BRIGHTRAY_BROWSER_MAC_COCOA_NOTIFICATION_H_ diff --git a/brightray/browser/mac/notification_presenter_mac.h b/brightray/browser/mac/notification_presenter_mac.h index 514a27625eab..f0781609846e 100644 --- a/brightray/browser/mac/notification_presenter_mac.h +++ b/brightray/browser/mac/notification_presenter_mac.h @@ -3,8 +3,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#ifndef BRIGHTRAY_BROWSER_NOTIFICATION_PRESENTER_MAC_H_ -#define BRIGHTRAY_BROWSER_NOTIFICATION_PRESENTER_MAC_H_ +#ifndef BRIGHTRAY_BROWSER_MAC_NOTIFICATION_PRESENTER_MAC_H_ +#define BRIGHTRAY_BROWSER_MAC_NOTIFICATION_PRESENTER_MAC_H_ #include "base/mac/scoped_nsobject.h" #include "browser/mac/notification_center_delegate.h" @@ -33,4 +33,4 @@ class NotificationPresenterMac : public NotificationPresenter { } // namespace brightray -#endif +#endif // BRIGHTRAY_BROWSER_MAC_NOTIFICATION_PRESENTER_MAC_H_ diff --git a/brightray/browser/net/devtools_network_conditions.h b/brightray/browser/net/devtools_network_conditions.h index 12acdc8bd4ff..f9885ba4680c 100644 --- a/brightray/browser/net/devtools_network_conditions.h +++ b/brightray/browser/net/devtools_network_conditions.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BROWSER_DEVTOOLS_NETWORK_CONDITIONS_H_ -#define BROWSER_DEVTOOLS_NETWORK_CONDITIONS_H_ +#ifndef BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_CONDITIONS_H_ +#define BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_CONDITIONS_H_ #include "base/macros.h" @@ -36,4 +36,4 @@ class DevToolsNetworkConditions { } // namespace brightray -#endif // BROWSER_DEVTOOLS_NETWORK_CONDITIONS_H_ +#endif // BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_CONDITIONS_H_ diff --git a/brightray/browser/net/devtools_network_controller.h b/brightray/browser/net/devtools_network_controller.h index c36d888df110..fb46193aa876 100644 --- a/brightray/browser/net/devtools_network_controller.h +++ b/brightray/browser/net/devtools_network_controller.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#ifndef BROWSER_DEVTOOLS_NETWORK_CONTROLLER_H_ -#define BROWSER_DEVTOOLS_NETWORK_CONTROLLER_H_ +#ifndef BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_CONTROLLER_H_ +#define BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_CONTROLLER_H_ #include #include @@ -41,4 +41,4 @@ class DevToolsNetworkController { } // namespace brightray -#endif // BROWSER_DEVTOOLS_NETWORK_CONTROLLER_H_ +#endif // BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_CONTROLLER_H_ diff --git a/brightray/browser/net/devtools_network_controller_handle.h b/brightray/browser/net/devtools_network_controller_handle.h index 2d038e837f80..cbb89ca25bce 100644 --- a/brightray/browser/net/devtools_network_controller_handle.h +++ b/brightray/browser/net/devtools_network_controller_handle.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#ifndef BROWSER_DEVTOOLS_NETWORK_CONTROLLER_HANDLE_H_ -#define BROWSER_DEVTOOLS_NETWORK_CONTROLLER_HANDLE_H_ +#ifndef BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_CONTROLLER_HANDLE_H_ +#define BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_CONTROLLER_HANDLE_H_ #include #include @@ -42,4 +42,4 @@ class DevToolsNetworkControllerHandle { } // namespace brightray -#endif // BROWSER_DEVTOOLS_NETWORK_CONTROLLER_HANDLE_H_ +#endif // BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_CONTROLLER_HANDLE_H_ diff --git a/brightray/browser/net/devtools_network_interceptor.h b/brightray/browser/net/devtools_network_interceptor.h index 4a04876b6f17..08f5f672164d 100644 --- a/brightray/browser/net/devtools_network_interceptor.h +++ b/brightray/browser/net/devtools_network_interceptor.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BROWSER_DEVTOOLS_NETWORK_INTERCEPTOR_H_ -#define BROWSER_DEVTOOLS_NETWORK_INTERCEPTOR_H_ +#ifndef BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_INTERCEPTOR_H_ +#define BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_INTERCEPTOR_H_ #include #include @@ -104,4 +104,4 @@ class DevToolsNetworkInterceptor { } // namespace brightray -#endif // BROWSER_DEVTOOLS_NETWORK_INTERCEPTOR_H_ +#endif // BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_INTERCEPTOR_H_ diff --git a/brightray/browser/net/devtools_network_protocol_handler.h b/brightray/browser/net/devtools_network_protocol_handler.h index 9ec577814c37..8efa3468fe12 100644 --- a/brightray/browser/net/devtools_network_protocol_handler.h +++ b/brightray/browser/net/devtools_network_protocol_handler.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BROWSER_DEVTOOLS_NETWORK_PROTOCOL_HANDLER_H_ -#define BROWSER_DEVTOOLS_NETWORK_PROTOCOL_HANDLER_H_ +#ifndef BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_PROTOCOL_HANDLER_H_ +#define BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_PROTOCOL_HANDLER_H_ #include "base/macros.h" #include "base/values.h" @@ -45,4 +45,4 @@ class DevToolsNetworkProtocolHandler { } // namespace brightray -#endif // BROWSER_DEVTOOLS_NETWORK_PROTOCOL_HANDLER_H_ +#endif // BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_PROTOCOL_HANDLER_H_ diff --git a/brightray/browser/net/devtools_network_transaction.h b/brightray/browser/net/devtools_network_transaction.h index 707755f724b5..e9ee54e2513e 100644 --- a/brightray/browser/net/devtools_network_transaction.h +++ b/brightray/browser/net/devtools_network_transaction.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BROWSER_DEVTOOLS_NETWORK_TRANSACTION_H_ -#define BROWSER_DEVTOOLS_NETWORK_TRANSACTION_H_ +#ifndef BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_TRANSACTION_H_ +#define BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_TRANSACTION_H_ #include @@ -104,4 +104,4 @@ class DevToolsNetworkTransaction : public net::HttpTransaction { } // namespace brightray -#endif // BROWSER_DEVTOOLS_NETWORK_TRANSACTION_H_ +#endif // BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_TRANSACTION_H_ diff --git a/brightray/browser/net/devtools_network_transaction_factory.h b/brightray/browser/net/devtools_network_transaction_factory.h index 49286a04742d..e303cc243623 100644 --- a/brightray/browser/net/devtools_network_transaction_factory.h +++ b/brightray/browser/net/devtools_network_transaction_factory.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#ifndef BROWSER_DEVTOOLS_NETWORK_TRANSACTION_FACTORY_H_ -#define BROWSER_DEVTOOLS_NETWORK_TRANSACTION_FACTORY_H_ +#ifndef BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_TRANSACTION_FACTORY_H_ +#define BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_TRANSACTION_FACTORY_H_ #include "base/macros.h" #include "net/base/request_priority.h" @@ -36,4 +36,4 @@ class DevToolsNetworkTransactionFactory : public net::HttpTransactionFactory { } // namespace brightray -#endif // BROWSER_DEVTOOLS_NETWORK_TRANSACTION_FACTORY_H_ +#endif // BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_TRANSACTION_FACTORY_H_ diff --git a/brightray/browser/net/devtools_network_upload_data_stream.h b/brightray/browser/net/devtools_network_upload_data_stream.h index da697374d9ec..ecc4b2c39ae9 100644 --- a/brightray/browser/net/devtools_network_upload_data_stream.h +++ b/brightray/browser/net/devtools_network_upload_data_stream.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BROWSER_DEVTOOLS_NETWORK_UPLOAD_DATA_STREAM_H_ -#define BROWSER_DEVTOOLS_NETWORK_UPLOAD_DATA_STREAM_H_ +#ifndef BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_UPLOAD_DATA_STREAM_H_ +#define BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_UPLOAD_DATA_STREAM_H_ #include @@ -47,4 +47,4 @@ class DevToolsNetworkUploadDataStream : public net::UploadDataStream { } // namespace brightray -#endif // BROWSER_DEVTOOLS_NETWORK_UPLOAD_DATA_STREAM_H_ +#endif // BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_UPLOAD_DATA_STREAM_H_ diff --git a/brightray/browser/net_log.h b/brightray/browser/net_log.h index e62c335350c7..254100ef7775 100644 --- a/brightray/browser/net_log.h +++ b/brightray/browser/net_log.h @@ -2,8 +2,8 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#ifndef BROWSER_NET_LOG_H_ -#define BROWSER_NET_LOG_H_ +#ifndef BRIGHTRAY_BROWSER_NET_LOG_H_ +#define BRIGHTRAY_BROWSER_NET_LOG_H_ #include "base/files/scoped_file.h" #include "net/log/net_log.h" @@ -27,4 +27,4 @@ class NetLog : public net::NetLog { } // namespace brightray -#endif // BROWSER_NET_LOG_H_ +#endif // BRIGHTRAY_BROWSER_NET_LOG_H_ diff --git a/brightray/browser/network_delegate.h b/brightray/browser/network_delegate.h index 3ab3b49700ff..6f9e13e2ea48 100644 --- a/brightray/browser/network_delegate.h +++ b/brightray/browser/network_delegate.h @@ -76,4 +76,4 @@ class NetworkDelegate : public net::NetworkDelegate { } // namespace brightray -#endif +#endif // BRIGHTRAY_BROWSER_NETWORK_DELEGATE_H_ diff --git a/brightray/browser/notification.h b/brightray/browser/notification.h index a330bc25d1b8..1e47d6cdac83 100644 --- a/brightray/browser/notification.h +++ b/brightray/browser/notification.h @@ -2,8 +2,8 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#ifndef BROWSER_NOTIFICATION_H_ -#define BROWSER_NOTIFICATION_H_ +#ifndef BRIGHTRAY_BROWSER_NOTIFICATION_H_ +#define BRIGHTRAY_BROWSER_NOTIFICATION_H_ #include "base/memory/weak_ptr.h" #include "base/strings/string16.h" @@ -62,4 +62,4 @@ class Notification { } // namespace brightray -#endif // BROWSER_NOTIFICATION_H_ +#endif // BRIGHTRAY_BROWSER_NOTIFICATION_H_ diff --git a/brightray/browser/notification_delegate.h b/brightray/browser/notification_delegate.h index 93512f71753d..c036b83bcfe0 100644 --- a/brightray/browser/notification_delegate.h +++ b/brightray/browser/notification_delegate.h @@ -2,8 +2,8 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#ifndef BROWSER_NOTIFICATION_DELEGATE_H_ -#define BROWSER_NOTIFICATION_DELEGATE_H_ +#ifndef BRIGHTRAY_BROWSER_NOTIFICATION_DELEGATE_H_ +#define BRIGHTRAY_BROWSER_NOTIFICATION_DELEGATE_H_ #include "content/public/browser/desktop_notification_delegate.h" @@ -20,4 +20,4 @@ class NotificationDelegate : public content::DesktopNotificationDelegate { } // namespace brightray -#endif // BROWSER_NOTIFICATION_DELEGATE_H_ +#endif // BRIGHTRAY_BROWSER_NOTIFICATION_DELEGATE_H_ diff --git a/brightray/browser/notification_delegate_adapter.h b/brightray/browser/notification_delegate_adapter.h index 01f3284e2b85..78a3e3c4daaa 100644 --- a/brightray/browser/notification_delegate_adapter.h +++ b/brightray/browser/notification_delegate_adapter.h @@ -2,8 +2,8 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#ifndef BROWSER_NOTIFICATION_DELEGATE_ADAPTER_H_ -#define BROWSER_NOTIFICATION_DELEGATE_ADAPTER_H_ +#ifndef BRIGHTRAY_BROWSER_NOTIFICATION_DELEGATE_ADAPTER_H_ +#define BRIGHTRAY_BROWSER_NOTIFICATION_DELEGATE_ADAPTER_H_ #include @@ -35,4 +35,4 @@ class NotificationDelegateAdapter : public NotificationDelegate { } // namespace brightray -#endif // BROWSER_NOTIFICATION_DELEGATE_ADAPTER_H_ +#endif // BRIGHTRAY_BROWSER_NOTIFICATION_DELEGATE_ADAPTER_H_ diff --git a/brightray/browser/notification_presenter.h b/brightray/browser/notification_presenter.h index 721ba92ace4a..93ddb1bffbcd 100644 --- a/brightray/browser/notification_presenter.h +++ b/brightray/browser/notification_presenter.h @@ -42,4 +42,4 @@ class NotificationPresenter { } // namespace brightray -#endif +#endif // BRIGHTRAY_BROWSER_NOTIFICATION_PRESENTER_H_ diff --git a/brightray/browser/permission_manager.h b/brightray/browser/permission_manager.h index 734529f06eb4..a63041fedc26 100644 --- a/brightray/browser/permission_manager.h +++ b/brightray/browser/permission_manager.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#ifndef BROWSER_PERMISSION_MANAGER_H_ -#define BROWSER_PERMISSION_MANAGER_H_ +#ifndef BRIGHTRAY_BROWSER_PERMISSION_MANAGER_H_ +#define BRIGHTRAY_BROWSER_PERMISSION_MANAGER_H_ #include "base/callback_forward.h" #include "base/macros.h" @@ -54,4 +54,4 @@ class PermissionManager : public content::PermissionManager { } // namespace brightray -#endif // BROWSER_PERMISSION_MANAGER_H_ +#endif // BRIGHTRAY_BROWSER_PERMISSION_MANAGER_H_ diff --git a/brightray/browser/platform_notification_service.h b/brightray/browser/platform_notification_service.h index f9b09c64bdff..30a631cc5e84 100644 --- a/brightray/browser/platform_notification_service.h +++ b/brightray/browser/platform_notification_service.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#ifndef BROWSER_PLATFORM_NOTIFICATION_SERVICE_H_ -#define BROWSER_PLATFORM_NOTIFICATION_SERVICE_H_ +#ifndef BRIGHTRAY_BROWSER_PLATFORM_NOTIFICATION_SERVICE_H_ +#define BRIGHTRAY_BROWSER_PLATFORM_NOTIFICATION_SERVICE_H_ #include "content/public/browser/browser_context.h" #include "content/public/browser/platform_notification_service.h" @@ -58,4 +58,4 @@ class PlatformNotificationService } // namespace brightray -#endif // BROWSER_PLATFORM_NOTIFICATION_SERVICE_H_ +#endif // BRIGHTRAY_BROWSER_PLATFORM_NOTIFICATION_SERVICE_H_ diff --git a/brightray/browser/url_request_context_getter.h b/brightray/browser/url_request_context_getter.h index dab7ae1e8728..f534c1a75728 100644 --- a/brightray/browser/url_request_context_getter.h +++ b/brightray/browser/url_request_context_getter.h @@ -120,4 +120,4 @@ class URLRequestContextGetter : public net::URLRequestContextGetter { } // namespace brightray -#endif +#endif // BRIGHTRAY_BROWSER_URL_REQUEST_CONTEXT_GETTER_H_ diff --git a/brightray/browser/web_ui_controller_factory.h b/brightray/browser/web_ui_controller_factory.h index ca86de6baa65..1739466f9207 100644 --- a/brightray/browser/web_ui_controller_factory.h +++ b/brightray/browser/web_ui_controller_factory.h @@ -42,4 +42,4 @@ class WebUIControllerFactory : public content::WebUIControllerFactory { } // namespace brightray -#endif +#endif // BRIGHTRAY_BROWSER_WEB_UI_CONTROLLER_FACTORY_H_ diff --git a/brightray/common/application_info.h b/brightray/common/application_info.h index 25b02c0d2393..ffff6ff0ab0e 100644 --- a/brightray/common/application_info.h +++ b/brightray/common/application_info.h @@ -10,4 +10,4 @@ std::string GetApplicationVersion(); } -#endif +#endif // BRIGHTRAY_COMMON_APPLICATION_INFO_H_ diff --git a/brightray/common/content_client.h b/brightray/common/content_client.h index 4d1d6238c954..09df6539692f 100644 --- a/brightray/common/content_client.h +++ b/brightray/common/content_client.h @@ -31,4 +31,4 @@ class ContentClient : public content::ContentClient { } // namespace brightray -#endif +#endif // BRIGHTRAY_COMMON_CONTENT_CLIENT_H_ diff --git a/brightray/common/mac/main_application_bundle.h b/brightray/common/mac/main_application_bundle.h index 78e6bc200b42..555738023cfd 100644 --- a/brightray/common/mac/main_application_bundle.h +++ b/brightray/common/mac/main_application_bundle.h @@ -18,4 +18,4 @@ base::FilePath MainApplicationBundlePath(); } // namespace brightray -#endif +#endif // BRIGHTRAY_COMMON_MAC_MAIN_APPLICATION_BUNDLE_H_ diff --git a/brightray/common/main_delegate.h b/brightray/common/main_delegate.h index 2f63a2fb1b1a..515e8a821db1 100644 --- a/brightray/common/main_delegate.h +++ b/brightray/common/main_delegate.h @@ -60,4 +60,5 @@ class MainDelegate : public content::ContentMainDelegate { }; } // namespace brightray -#endif + +#endif // BRIGHTRAY_COMMON_MAIN_DELEGATE_H_ diff --git a/script/cpplint.py b/script/cpplint.py index 0c91dc06aea8..e602b3cb1e6b 100755 --- a/script/cpplint.py +++ b/script/cpplint.py @@ -22,10 +22,16 @@ IGNORE_FILES = [ os.path.join('brightray', 'browser', 'mac', 'event_dispatching_window.h'), os.path.join('brightray', 'browser', 'mac', 'notification_center_delegate.h'), + os.path.join('brightray', 'browser', 'win', 'notification_presenter_win7.h'), + os.path.join('brightray', 'browser', 'win', 'win32_desktop_notifications', + 'common.h'), os.path.join('brightray', 'browser', 'win', 'win32_desktop_notifications', 'desktop_notification_controller.cc'), os.path.join('brightray', 'browser', 'win', 'win32_desktop_notifications', - 'desktop_notification_controller.h') + 'desktop_notification_controller.h'), + os.path.join('brightray', 'browser', 'win', 'win32_desktop_notifications', + 'toast.h'), + os.path.join('brightray', 'browser', 'win', 'win32_notification.h') ] SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) From f193b2b2a642b4a025fc59586c6bc6bafab7df1c Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 18 May 2017 15:06:57 -0700 Subject: [PATCH 06/16] Fix build/include_what_you_use linter violations in brightray --- brightray/CPPLINT.cfg | 2 +- brightray/browser/browser_client.h | 3 +++ brightray/browser/browser_context.h | 1 + brightray/browser/devtools_file_system_indexer.cc | 2 ++ brightray/browser/devtools_manager_delegate.h | 2 ++ brightray/browser/inspectable_web_contents.h | 2 ++ brightray/browser/inspectable_web_contents_impl.h | 4 ++++ brightray/browser/inspectable_web_contents_view_delegate.h | 2 ++ brightray/browser/linux/libnotify_notification.h | 2 ++ brightray/browser/mac/cocoa_notification.h | 2 ++ brightray/browser/media/media_capture_devices_dispatcher.h | 2 ++ brightray/browser/net/devtools_network_protocol_handler.cc | 3 ++- brightray/browser/net/devtools_network_transaction.cc | 2 ++ brightray/browser/net/devtools_network_transaction_factory.cc | 3 +++ brightray/browser/notification.h | 2 ++ brightray/browser/permission_manager.h | 2 ++ brightray/browser/platform_notification_service.h | 3 +++ brightray/browser/url_request_context_getter.h | 3 +++ brightray/browser/views/views_delegate.h | 2 ++ brightray/browser/win/notification_presenter_win.cc | 3 +++ brightray/browser/win/notification_presenter_win7.cc | 3 +++ brightray/browser/win/win32_notification.cc | 4 ++++ brightray/browser/win/windows_toast_notification.h | 1 + brightray/browser/zoom_level_delegate.cc | 1 + brightray/browser/zoom_level_delegate.h | 2 ++ brightray/common/content_client.cc | 3 +-- brightray/common/content_client.h | 2 ++ brightray/common/main_delegate.h | 1 + 28 files changed, 60 insertions(+), 4 deletions(-) diff --git a/brightray/CPPLINT.cfg b/brightray/CPPLINT.cfg index 1e4a4e6de3aa..41ce31dcad96 100644 --- a/brightray/CPPLINT.cfg +++ b/brightray/CPPLINT.cfg @@ -1 +1 @@ -filter=-build/include_what_you_use,-legal/copyright,-runtime/references +filter=-legal/copyright,-runtime/references diff --git a/brightray/browser/browser_client.h b/brightray/browser/browser_client.h index 4426de839298..db6737897982 100644 --- a/brightray/browser/browser_client.h +++ b/brightray/browser/browser_client.h @@ -5,6 +5,9 @@ #ifndef BRIGHTRAY_BROWSER_BROWSER_CLIENT_H_ #define BRIGHTRAY_BROWSER_BROWSER_CLIENT_H_ +#include +#include + #include "browser/net_log.h" #include "content/public/browser/content_browser_client.h" diff --git a/brightray/browser/browser_context.h b/brightray/browser/browser_context.h index f533c73f1c42..810fc83f7a60 100644 --- a/brightray/browser/browser_context.h +++ b/brightray/browser/browser_context.h @@ -6,6 +6,7 @@ #define BRIGHTRAY_BROWSER_BROWSER_CONTEXT_H_ #include +#include #include "browser/net/devtools_network_controller_handle.h" #include "browser/permission_manager.h" diff --git a/brightray/browser/devtools_file_system_indexer.cc b/brightray/browser/devtools_file_system_indexer.cc index 5217810a5779..d906f0d0bb64 100644 --- a/brightray/browser/devtools_file_system_indexer.cc +++ b/brightray/browser/devtools_file_system_indexer.cc @@ -6,7 +6,9 @@ #include +#include #include +#include #include "base/bind.h" #include "base/files/file_enumerator.h" diff --git a/brightray/browser/devtools_manager_delegate.h b/brightray/browser/devtools_manager_delegate.h index e351b06c25cc..96ff5a7e0d98 100644 --- a/brightray/browser/devtools_manager_delegate.h +++ b/brightray/browser/devtools_manager_delegate.h @@ -5,6 +5,8 @@ #ifndef BRIGHTRAY_BROWSER_DEVTOOLS_MANAGER_DELEGATE_H_ #define BRIGHTRAY_BROWSER_DEVTOOLS_MANAGER_DELEGATE_H_ +#include + #include "base/macros.h" #include "base/compiler_specific.h" #include "content/public/browser/devtools_manager_delegate.h" diff --git a/brightray/browser/inspectable_web_contents.h b/brightray/browser/inspectable_web_contents.h index 3b717a2b5f5a..28c00f6d72df 100644 --- a/brightray/browser/inspectable_web_contents.h +++ b/brightray/browser/inspectable_web_contents.h @@ -1,6 +1,8 @@ #ifndef BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_H_ #define BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_H_ +#include + #include "content/public/browser/web_contents.h" namespace base { diff --git a/brightray/browser/inspectable_web_contents_impl.h b/brightray/browser/inspectable_web_contents_impl.h index 288f6119c44e..99bb535456d9 100644 --- a/brightray/browser/inspectable_web_contents_impl.h +++ b/brightray/browser/inspectable_web_contents_impl.h @@ -6,6 +6,10 @@ #ifndef BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_IMPL_H_ #define BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_IMPL_H_ +#include +#include +#include + #include "browser/inspectable_web_contents.h" #include "browser/devtools_contents_resizing_strategy.h" diff --git a/brightray/browser/inspectable_web_contents_view_delegate.h b/brightray/browser/inspectable_web_contents_view_delegate.h index 7992c3830b14..1f30735497c4 100644 --- a/brightray/browser/inspectable_web_contents_view_delegate.h +++ b/brightray/browser/inspectable_web_contents_view_delegate.h @@ -1,6 +1,8 @@ #ifndef BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_VIEW_DELEGATE_H_ #define BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_VIEW_DELEGATE_H_ +#include + #include "ui/gfx/image/image_skia.h" namespace brightray { diff --git a/brightray/browser/linux/libnotify_notification.h b/brightray/browser/linux/libnotify_notification.h index 41633f54b66b..ebe28739e94a 100644 --- a/brightray/browser/linux/libnotify_notification.h +++ b/brightray/browser/linux/libnotify_notification.h @@ -5,6 +5,8 @@ #ifndef BRIGHTRAY_BROWSER_LINUX_LIBNOTIFY_NOTIFICATION_H_ #define BRIGHTRAY_BROWSER_LINUX_LIBNOTIFY_NOTIFICATION_H_ +#include + #include "browser/linux/libnotify_loader.h" #include "browser/notification.h" #include "ui/base/glib/glib_signal.h" diff --git a/brightray/browser/mac/cocoa_notification.h b/brightray/browser/mac/cocoa_notification.h index 96b09c5da578..7ad5c0973b1c 100644 --- a/brightray/browser/mac/cocoa_notification.h +++ b/brightray/browser/mac/cocoa_notification.h @@ -7,6 +7,8 @@ #import +#include + #include "base/mac/scoped_nsobject.h" #include "browser/notification.h" diff --git a/brightray/browser/media/media_capture_devices_dispatcher.h b/brightray/browser/media/media_capture_devices_dispatcher.h index b64596092a5c..32f3b60ff8b0 100644 --- a/brightray/browser/media/media_capture_devices_dispatcher.h +++ b/brightray/browser/media/media_capture_devices_dispatcher.h @@ -5,6 +5,8 @@ #ifndef BRIGHTRAY_BROWSER_MEDIA_MEDIA_CAPTURE_DEVICES_DISPATCHER_H_ #define BRIGHTRAY_BROWSER_MEDIA_MEDIA_CAPTURE_DEVICES_DISPATCHER_H_ +#include + #include "base/memory/singleton.h" #include "content/public/browser/media_observer.h" #include "content/public/common/media_stream_request.h" diff --git a/brightray/browser/net/devtools_network_protocol_handler.cc b/brightray/browser/net/devtools_network_protocol_handler.cc index 58988577b432..b7b6670eb2ac 100644 --- a/brightray/browser/net/devtools_network_protocol_handler.cc +++ b/brightray/browser/net/devtools_network_protocol_handler.cc @@ -4,6 +4,8 @@ #include "browser/net/devtools_network_protocol_handler.h" +#include + #include "browser/browser_context.h" #include "browser/net/devtools_network_conditions.h" #include "browser/net/devtools_network_controller.h" @@ -12,7 +14,6 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/devtools_agent_host.h" - namespace brightray { namespace { diff --git a/brightray/browser/net/devtools_network_transaction.cc b/brightray/browser/net/devtools_network_transaction.cc index ced70acc5e4a..1e42a623e9e3 100644 --- a/brightray/browser/net/devtools_network_transaction.cc +++ b/brightray/browser/net/devtools_network_transaction.cc @@ -4,6 +4,8 @@ #include "browser/net/devtools_network_transaction.h" +#include + #include "browser/net/devtools_network_controller.h" #include "browser/net/devtools_network_upload_data_stream.h" #include "net/base/load_timing_info.h" diff --git a/brightray/browser/net/devtools_network_transaction_factory.cc b/brightray/browser/net/devtools_network_transaction_factory.cc index 7373c14ddeff..ffb73852a44a 100644 --- a/brightray/browser/net/devtools_network_transaction_factory.cc +++ b/brightray/browser/net/devtools_network_transaction_factory.cc @@ -4,6 +4,9 @@ #include "browser/net/devtools_network_transaction_factory.h" +#include +#include + #include "browser/net/devtools_network_controller.h" #include "browser/net/devtools_network_transaction.h" diff --git a/brightray/browser/notification.h b/brightray/browser/notification.h index 1e47d6cdac83..e59cab7a0cd4 100644 --- a/brightray/browser/notification.h +++ b/brightray/browser/notification.h @@ -5,6 +5,8 @@ #ifndef BRIGHTRAY_BROWSER_NOTIFICATION_H_ #define BRIGHTRAY_BROWSER_NOTIFICATION_H_ +#include + #include "base/memory/weak_ptr.h" #include "base/strings/string16.h" diff --git a/brightray/browser/permission_manager.h b/brightray/browser/permission_manager.h index a63041fedc26..da39fdd91bde 100644 --- a/brightray/browser/permission_manager.h +++ b/brightray/browser/permission_manager.h @@ -5,6 +5,8 @@ #ifndef BRIGHTRAY_BROWSER_PERMISSION_MANAGER_H_ #define BRIGHTRAY_BROWSER_PERMISSION_MANAGER_H_ +#include + #include "base/callback_forward.h" #include "base/macros.h" #include "content/public/browser/permission_manager.h" diff --git a/brightray/browser/platform_notification_service.h b/brightray/browser/platform_notification_service.h index 30a631cc5e84..298bb3eeff7e 100644 --- a/brightray/browser/platform_notification_service.h +++ b/brightray/browser/platform_notification_service.h @@ -5,6 +5,9 @@ #ifndef BRIGHTRAY_BROWSER_PLATFORM_NOTIFICATION_SERVICE_H_ #define BRIGHTRAY_BROWSER_PLATFORM_NOTIFICATION_SERVICE_H_ +#include +#include + #include "content/public/browser/browser_context.h" #include "content/public/browser/platform_notification_service.h" diff --git a/brightray/browser/url_request_context_getter.h b/brightray/browser/url_request_context_getter.h index f534c1a75728..d1fa00c48582 100644 --- a/brightray/browser/url_request_context_getter.h +++ b/brightray/browser/url_request_context_getter.h @@ -5,6 +5,9 @@ #ifndef BRIGHTRAY_BROWSER_URL_REQUEST_CONTEXT_GETTER_H_ #define BRIGHTRAY_BROWSER_URL_REQUEST_CONTEXT_GETTER_H_ +#include +#include + #include "base/files/file_path.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/content_browser_client.h" diff --git a/brightray/browser/views/views_delegate.h b/brightray/browser/views/views_delegate.h index d63eeb533d67..a764f8c16e3d 100644 --- a/brightray/browser/views/views_delegate.h +++ b/brightray/browser/views/views_delegate.h @@ -5,6 +5,8 @@ #ifndef BRIGHTRAY_BROWSER_VIEWS_VIEWS_DELEGATE_H_ #define BRIGHTRAY_BROWSER_VIEWS_VIEWS_DELEGATE_H_ +#include + #include "base/compiler_specific.h" #include "ui/views/views_delegate.h" diff --git a/brightray/browser/win/notification_presenter_win.cc b/brightray/browser/win/notification_presenter_win.cc index 930775c792b2..acb4b22932c0 100644 --- a/brightray/browser/win/notification_presenter_win.cc +++ b/brightray/browser/win/notification_presenter_win.cc @@ -6,6 +6,9 @@ #include "browser/win/notification_presenter_win.h" +#include +#include + #include "base/files/file_util.h" #include "base/md5.h" #include "base/strings/utf_string_conversions.h" diff --git a/brightray/browser/win/notification_presenter_win7.cc b/brightray/browser/win/notification_presenter_win7.cc index f002c476d5a9..05286946e3e2 100644 --- a/brightray/browser/win/notification_presenter_win7.cc +++ b/brightray/browser/win/notification_presenter_win7.cc @@ -1,4 +1,7 @@ #include "browser/win/notification_presenter_win7.h" + +#include + #include "browser/win/win32_notification.h" namespace brightray { diff --git a/brightray/browser/win/win32_notification.cc b/brightray/browser/win/win32_notification.cc index 5b6093658aac..8c80c9d37a90 100644 --- a/brightray/browser/win/win32_notification.cc +++ b/brightray/browser/win/win32_notification.cc @@ -1,6 +1,10 @@ #define WIN32_LEAN_AND_MEAN + #include "browser/win/win32_notification.h" + #include +#include + #include "third_party/skia/include/core/SkBitmap.h" namespace brightray { diff --git a/brightray/browser/win/windows_toast_notification.h b/brightray/browser/win/windows_toast_notification.h index 47c7d596a88b..3b32170183ba 100644 --- a/brightray/browser/win/windows_toast_notification.h +++ b/brightray/browser/win/windows_toast_notification.h @@ -12,6 +12,7 @@ #include #include #include +#include #include "browser/notification.h" diff --git a/brightray/browser/zoom_level_delegate.cc b/brightray/browser/zoom_level_delegate.cc index 7148b18e18a4..0b8f373970bb 100644 --- a/brightray/browser/zoom_level_delegate.cc +++ b/brightray/browser/zoom_level_delegate.cc @@ -5,6 +5,7 @@ #include "browser/zoom_level_delegate.h" #include +#include #include "base/bind.h" #include "base/strings/string_number_conversions.h" diff --git a/brightray/browser/zoom_level_delegate.h b/brightray/browser/zoom_level_delegate.h index aed065d7ec66..d3a9424a3452 100644 --- a/brightray/browser/zoom_level_delegate.h +++ b/brightray/browser/zoom_level_delegate.h @@ -5,6 +5,8 @@ #ifndef BRIGHTRAY_BROWSER_ZOOM_LEVEL_DELEGATE_H_ #define BRIGHTRAY_BROWSER_ZOOM_LEVEL_DELEGATE_H_ +#include + #include "base/files/file_path.h" #include "base/macros.h" #include "components/prefs/pref_service.h" diff --git a/brightray/common/content_client.cc b/brightray/common/content_client.cc index ebe066be613d..a9f7e414c152 100644 --- a/brightray/common/content_client.cc +++ b/brightray/common/content_client.cc @@ -4,10 +4,9 @@ #include "common/content_client.h" -#include "common/application_info.h" - #include "base/strings/stringprintf.h" #include "base/strings/string_util.h" +#include "common/application_info.h" #include "content/public/common/user_agent.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/brightray/common/content_client.h b/brightray/common/content_client.h index 09df6539692f..44fddd8b45a5 100644 --- a/brightray/common/content_client.h +++ b/brightray/common/content_client.h @@ -5,6 +5,8 @@ #ifndef BRIGHTRAY_COMMON_CONTENT_CLIENT_H_ #define BRIGHTRAY_COMMON_CONTENT_CLIENT_H_ +#include + #include "base/compiler_specific.h" #include "content/public/common/content_client.h" diff --git a/brightray/common/main_delegate.h b/brightray/common/main_delegate.h index 515e8a821db1..4139a20521b0 100644 --- a/brightray/common/main_delegate.h +++ b/brightray/common/main_delegate.h @@ -6,6 +6,7 @@ #define BRIGHTRAY_COMMON_MAIN_DELEGATE_H_ #include +#include #include "base/macros.h" #include "content/public/app/content_main_delegate.h" From b6992436a0d1e727d2491a6b257ded7ee296c719 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 18 May 2017 15:29:22 -0700 Subject: [PATCH 07/16] Remove exclusion of runtime/references rule --- brightray/CPPLINT.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/brightray/CPPLINT.cfg b/brightray/CPPLINT.cfg index 41ce31dcad96..88c6f99113d5 100644 --- a/brightray/CPPLINT.cfg +++ b/brightray/CPPLINT.cfg @@ -1 +1 @@ -filter=-legal/copyright,-runtime/references +filter=-legal/copyright From c4608c0f371c030055ea39c7210ef5444624f4bd Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 18 May 2017 15:29:22 -0700 Subject: [PATCH 08/16] Fix build/include_alpha linter violations in brightray --- brightray/CPPLINT.cfg | 2 +- brightray/browser/browser_context.cc | 11 ++++------- brightray/browser/browser_context.h | 5 ++--- brightray/browser/browser_main_parts.cc | 2 +- brightray/browser/devtools_manager_delegate.cc | 6 ++---- brightray/browser/devtools_manager_delegate.h | 2 +- .../browser/inspectable_web_contents_impl.cc | 2 +- brightray/browser/inspectable_web_contents_impl.h | 6 ++---- brightray/browser/linux/libnotify_loader.h | 1 - .../mac/bry_inspectable_web_contents_view.h | 3 +-- .../mac/bry_inspectable_web_contents_view.mm | 1 - .../media/media_stream_devices_controller.cc | 1 - .../browser/net/devtools_network_controller.cc | 3 +-- .../browser/net/devtools_network_controller.h | 2 +- .../net/devtools_network_protocol_handler.cc | 3 +-- .../net/devtools_network_transaction_factory.cc | 1 - .../browser/platform_notification_service.cc | 2 +- brightray/browser/url_request_context_getter.cc | 15 +++++++-------- brightray/browser/web_ui_controller_factory.cc | 2 +- .../browser/win/windows_toast_notification.cc | 2 +- brightray/common/application_info_mac.mm | 3 +-- brightray/common/application_info_win.cc | 4 ++-- brightray/common/content_client.cc | 2 +- brightray/common/main_delegate.cc | 5 ++--- brightray/common/main_delegate_mac.mm | 6 +++--- 25 files changed, 37 insertions(+), 55 deletions(-) diff --git a/brightray/CPPLINT.cfg b/brightray/CPPLINT.cfg index 88c6f99113d5..c9bbb2e5968e 100644 --- a/brightray/CPPLINT.cfg +++ b/brightray/CPPLINT.cfg @@ -1 +1 @@ -filter=-legal/copyright +filter=-legal/copyright,+build/include_alpha diff --git a/brightray/browser/browser_context.cc b/brightray/browser/browser_context.cc index e4b7fd4d1165..ef752ae189f0 100644 --- a/brightray/browser/browser_context.cc +++ b/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" diff --git a/brightray/browser/browser_context.h b/brightray/browser/browser_context.h index 810fc83f7a60..6c8a78ce5c88 100644 --- a/brightray/browser/browser_context.h +++ b/brightray/browser/browser_context.h @@ -8,12 +8,11 @@ #include #include +#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; diff --git a/brightray/browser/browser_main_parts.cc b/brightray/browser/browser_main_parts.cc index 8d46b4af4b4c..54f8a60d4d02 100644 --- a/brightray/browser/browser_main_parts.cc +++ b/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" diff --git a/brightray/browser/devtools_manager_delegate.cc b/brightray/browser/devtools_manager_delegate.cc index 7d4ae4d7d459..28fdbf27466b 100644 --- a/brightray/browser/devtools_manager_delegate.cc +++ b/brightray/browser/devtools_manager_delegate.cc @@ -6,14 +6,13 @@ #include -#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 { diff --git a/brightray/browser/devtools_manager_delegate.h b/brightray/browser/devtools_manager_delegate.h index 96ff5a7e0d98..f20c32050eeb 100644 --- a/brightray/browser/devtools_manager_delegate.h +++ b/brightray/browser/devtools_manager_delegate.h @@ -7,8 +7,8 @@ #include -#include "base/macros.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "content/public/browser/devtools_manager_delegate.h" namespace brightray { diff --git a/brightray/browser/inspectable_web_contents_impl.cc b/brightray/browser/inspectable_web_contents_impl.cc index 20ee3081558a..1b103eb7f68c 100644 --- a/brightray/browser/inspectable_web_contents_impl.cc +++ b/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" diff --git a/brightray/browser/inspectable_web_contents_impl.h b/brightray/browser/inspectable_web_contents_impl.h index 99bb535456d9..e5187dd5c9dd 100644 --- a/brightray/browser/inspectable_web_contents_impl.h +++ b/brightray/browser/inspectable_web_contents_impl.h @@ -10,12 +10,10 @@ #include #include -#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" diff --git a/brightray/browser/linux/libnotify_loader.h b/brightray/browser/linux/libnotify_loader.h index a48f4794147f..16ea7db3b690 100644 --- a/brightray/browser/linux/libnotify_loader.h +++ b/brightray/browser/linux/libnotify_loader.h @@ -6,7 +6,6 @@ #define BRIGHTRAY_BROWSER_LINUX_LIBNOTIFY_LOADER_H_ #include - #include class LibNotifyLoader { diff --git a/brightray/browser/mac/bry_inspectable_web_contents_view.h b/brightray/browser/mac/bry_inspectable_web_contents_view.h index 9819f2d767e4..c9a8dce615a7 100644 --- a/brightray/browser/mac/bry_inspectable_web_contents_view.h +++ b/brightray/browser/mac/bry_inspectable_web_contents_view.h @@ -1,8 +1,7 @@ #import -#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 { diff --git a/brightray/browser/mac/bry_inspectable_web_contents_view.mm b/brightray/browser/mac/bry_inspectable_web_contents_view.mm index 25e7083948ba..7ee36b0e9284 100644 --- a/brightray/browser/mac/bry_inspectable_web_contents_view.mm +++ b/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" diff --git a/brightray/browser/media/media_stream_devices_controller.cc b/brightray/browser/media/media_stream_devices_controller.cc index c01749ab43d2..18f19d12a042 100644 --- a/brightray/browser/media/media_stream_devices_controller.cc +++ b/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" diff --git a/brightray/browser/net/devtools_network_controller.cc b/brightray/browser/net/devtools_network_controller.cc index 8bf411ac1a4e..66afca63c27c 100644 --- a/brightray/browser/net/devtools_network_controller.cc +++ b/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; diff --git a/brightray/browser/net/devtools_network_controller.h b/brightray/browser/net/devtools_network_controller.h index fb46193aa876..1ba5bf308691 100644 --- a/brightray/browser/net/devtools_network_controller.h +++ b/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 #include #include +#include #include "base/macros.h" #include "base/threading/thread_checker.h" diff --git a/brightray/browser/net/devtools_network_protocol_handler.cc b/brightray/browser/net/devtools_network_protocol_handler.cc index b7b6670eb2ac..c846609a56e0 100644 --- a/brightray/browser/net/devtools_network_protocol_handler.cc +++ b/brightray/browser/net/devtools_network_protocol_handler.cc @@ -6,11 +6,10 @@ #include +#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" diff --git a/brightray/browser/net/devtools_network_transaction_factory.cc b/brightray/browser/net/devtools_network_transaction_factory.cc index ffb73852a44a..c21aae5066b6 100644 --- a/brightray/browser/net/devtools_network_transaction_factory.cc +++ b/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" diff --git a/brightray/browser/platform_notification_service.cc b/brightray/browser/platform_notification_service.cc index 36c515153537..b9ac0b787cfb 100644 --- a/brightray/browser/platform_notification_service.cc +++ b/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 { diff --git a/brightray/browser/url_request_context_getter.cc b/brightray/browser/url_request_context_getter.cc index c6045e34c059..de11498398cf 100644 --- a/brightray/browser/url_request_context_getter.cc +++ b/brightray/browser/url_request_context_getter.cc @@ -6,18 +6,17 @@ #include +#include "base/command_line.h" +#include "base/memory/ptr_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 "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/threading/sequenced_worker_pool.h" -#include "base/threading/worker_pool.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" diff --git a/brightray/browser/web_ui_controller_factory.cc b/brightray/browser/web_ui_controller_factory.cc index 565c0258883a..8cebff1855de 100644 --- a/brightray/browser/web_ui_controller_factory.cc +++ b/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" diff --git a/brightray/browser/win/windows_toast_notification.cc b/brightray/browser/win/windows_toast_notification.cc index 0e0c9249c11e..c5f25d546879 100644 --- a/brightray/browser/win/windows_toast_notification.cc +++ b/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" diff --git a/brightray/common/application_info_mac.mm b/brightray/common/application_info_mac.mm index 3bb4b377858d..6472bc054542 100644 --- a/brightray/common/application_info_mac.mm +++ b/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 { diff --git a/brightray/common/application_info_win.cc b/brightray/common/application_info_win.cc index 22635711cb48..69358305d081 100644 --- a/brightray/common/application_info_win.cc +++ b/brightray/common/application_info_win.cc @@ -1,7 +1,7 @@ -#include - #include "common/application_info.h" +#include + #include "base/file_version_info.h" #include "base/strings/utf_string_conversions.h" diff --git a/brightray/common/content_client.cc b/brightray/common/content_client.cc index a9f7e414c152..5bc94a127edb 100644 --- a/brightray/common/content_client.cc +++ b/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" diff --git a/brightray/common/main_delegate.cc b/brightray/common/main_delegate.cc index 4551ddfa0aa1..60b1a1dd7e6e 100644 --- a/brightray/common/main_delegate.cc +++ b/brightray/common/main_delegate.cc @@ -6,11 +6,10 @@ #include -#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" diff --git a/brightray/common/main_delegate_mac.mm b/brightray/common/main_delegate_mac.mm index 372ec15693c2..fb59ccd67a39 100644 --- a/brightray/common/main_delegate_mac.mm +++ b/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" From d7321ed9803ddcfb1fc40fcfefc0dda091db6897 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 18 May 2017 15:58:12 -0700 Subject: [PATCH 09/16] Add brightray prefix to include paths from within brightray --- brightray/brightray.gyp | 3 +-- brightray/browser/browser_client.cc | 14 +++++++------- brightray/browser/browser_client.h | 2 +- brightray/browser/browser_context.cc | 18 +++++++++--------- brightray/browser/browser_context.h | 6 +++--- brightray/browser/browser_main_parts.cc | 14 +++++++------- brightray/browser/browser_main_parts_mac.mm | 2 +- .../devtools_contents_resizing_strategy.cc | 2 +- .../devtools_embedder_message_dispatcher.cc | 2 +- .../browser/devtools_file_system_indexer.cc | 2 +- brightray/browser/devtools_manager_delegate.cc | 6 +++--- brightray/browser/devtools_ui.cc | 2 +- brightray/browser/inspectable_web_contents.cc | 4 ++-- .../browser/inspectable_web_contents_impl.cc | 14 +++++++------- .../browser/inspectable_web_contents_impl.h | 6 +++--- .../inspectable_web_contents_view_delegate.cc | 2 +- .../inspectable_web_contents_view_mac.h | 2 +- .../inspectable_web_contents_view_mac.mm | 8 ++++---- brightray/browser/linux/libnotify_loader.cc | 2 +- .../browser/linux/libnotify_notification.cc | 6 +++--- .../browser/linux/libnotify_notification.h | 4 ++-- .../linux/notification_presenter_linux.cc | 4 ++-- .../linux/notification_presenter_linux.h | 2 +- .../mac/bry_inspectable_web_contents_view.h | 2 +- .../mac/bry_inspectable_web_contents_view.mm | 10 +++++----- brightray/browser/mac/cocoa_notification.h | 2 +- brightray/browser/mac/cocoa_notification.mm | 6 +++--- .../browser/mac/event_dispatching_window.mm | 2 +- .../mac/notification_center_delegate.mm | 6 +++--- .../browser/mac/notification_presenter_mac.h | 4 ++-- .../browser/mac/notification_presenter_mac.mm | 6 +++--- .../media/media_capture_devices_dispatcher.cc | 2 +- .../browser/media/media_device_id_salt.cc | 2 +- .../media/media_stream_devices_controller.cc | 4 ++-- .../browser/net/devtools_network_conditions.cc | 2 +- .../browser/net/devtools_network_controller.cc | 8 ++++---- .../net/devtools_network_controller_handle.cc | 6 +++--- .../net/devtools_network_interceptor.cc | 4 ++-- .../net/devtools_network_protocol_handler.cc | 8 ++++---- .../net/devtools_network_transaction.cc | 6 +++--- .../browser/net/devtools_network_transaction.h | 2 +- .../devtools_network_transaction_factory.cc | 6 +++--- .../net/devtools_network_upload_data_stream.cc | 2 +- .../net/devtools_network_upload_data_stream.h | 2 +- brightray/browser/net_log.cc | 2 +- brightray/browser/network_delegate.cc | 2 +- brightray/browser/notification.cc | 6 +++--- .../browser/notification_delegate_adapter.cc | 2 +- .../browser/notification_delegate_adapter.h | 2 +- brightray/browser/notification_presenter.cc | 4 ++-- brightray/browser/permission_manager.cc | 2 +- .../browser/platform_notification_service.cc | 10 +++++----- brightray/browser/special_storage_policy.cc | 2 +- .../browser/url_request_context_getter.cc | 12 ++++++------ brightray/browser/views/views_delegate.cc | 2 +- brightray/browser/web_ui_controller_factory.cc | 4 ++-- .../browser/win/notification_presenter_win.cc | 6 +++--- .../browser/win/notification_presenter_win.h | 2 +- .../browser/win/notification_presenter_win7.cc | 4 ++-- .../browser/win/notification_presenter_win7.h | 4 ++-- brightray/browser/win/scoped_hstring.cc | 2 +- .../desktop_notification_controller.cc | 6 +++--- .../win/win32_desktop_notifications/toast.cc | 4 ++-- .../win/win32_desktop_notifications/toast.h | 2 +- brightray/browser/win/win32_notification.cc | 2 +- brightray/browser/win/win32_notification.h | 4 ++-- .../browser/win/windows_toast_notification.cc | 10 +++++----- .../browser/win/windows_toast_notification.h | 2 +- brightray/browser/zoom_level_delegate.cc | 2 +- brightray/common/application_info_mac.mm | 4 ++-- brightray/common/application_info_win.cc | 2 +- brightray/common/content_client.cc | 4 ++-- .../common/mac/main_application_bundle.mm | 2 +- brightray/common/main_delegate.cc | 6 +++--- brightray/common/main_delegate_mac.mm | 4 ++-- brightray/common/switches.cc | 2 +- 76 files changed, 171 insertions(+), 172 deletions(-) diff --git a/brightray/brightray.gyp b/brightray/brightray.gyp index efa0f433ba82..e3a26770994f 100644 --- a/brightray/brightray.gyp +++ b/brightray/brightray.gyp @@ -11,7 +11,7 @@ 'target_name': 'brightray', 'type': 'static_library', 'include_dirs': [ - '.', + '..', '<(libchromiumcontent_src_dir)', '<(libchromiumcontent_src_dir)/skia/config', '<(libchromiumcontent_src_dir)/third_party/boringssl/src/include', @@ -22,7 +22,6 @@ ], 'direct_dependent_settings': { 'include_dirs': [ - '.', '../vendor', '<(libchromiumcontent_src_dir)', '<(libchromiumcontent_src_dir)/gpu', diff --git a/brightray/browser/browser_client.cc b/brightray/browser/browser_client.cc index 7b25c6a78588..5aa3208dafcd 100644 --- a/brightray/browser/browser_client.cc +++ b/brightray/browser/browser_client.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#include "browser/browser_client.h" +#include "brightray/browser/browser_client.h" #include "base/path_service.h" -#include "browser/browser_context.h" -#include "browser/browser_main_parts.h" -#include "browser/devtools_manager_delegate.h" -#include "browser/media/media_capture_devices_dispatcher.h" -#include "browser/notification_presenter.h" -#include "browser/platform_notification_service.h" +#include "brightray/browser/browser_context.h" +#include "brightray/browser/browser_main_parts.h" +#include "brightray/browser/devtools_manager_delegate.h" +#include "brightray/browser/media/media_capture_devices_dispatcher.h" +#include "brightray/browser/notification_presenter.h" +#include "brightray/browser/platform_notification_service.h" #include "content/public/common/url_constants.h" namespace brightray { diff --git a/brightray/browser/browser_client.h b/brightray/browser/browser_client.h index db6737897982..cc162242f751 100644 --- a/brightray/browser/browser_client.h +++ b/brightray/browser/browser_client.h @@ -8,7 +8,7 @@ #include #include -#include "browser/net_log.h" +#include "brightray/browser/net_log.h" #include "content/public/browser/content_browser_client.h" namespace brightray { diff --git a/brightray/browser/browser_context.cc b/brightray/browser/browser_context.cc index ef752ae189f0..a1781e0c6a20 100644 --- a/brightray/browser/browser_context.cc +++ b/brightray/browser/browser_context.cc @@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#include "browser/browser_context.h" +#include "brightray/browser/browser_context.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 "brightray/browser/brightray_paths.h" +#include "brightray/browser/browser_client.h" +#include "brightray/browser/inspectable_web_contents_impl.h" +#include "brightray/browser/media/media_device_id_salt.h" +#include "brightray/browser/network_delegate.h" +#include "brightray/browser/special_storage_policy.h" +#include "brightray/browser/zoom_level_delegate.h" +#include "brightray/common/application_info.h" #include "components/prefs/json_pref_store.h" #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h" diff --git a/brightray/browser/browser_context.h b/brightray/browser/browser_context.h index 6c8a78ce5c88..e740f4579f6b 100644 --- a/brightray/browser/browser_context.h +++ b/brightray/browser/browser_context.h @@ -10,9 +10,9 @@ #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 "brightray/browser/net/devtools_network_controller_handle.h" +#include "brightray/browser/permission_manager.h" +#include "brightray/browser/url_request_context_getter.h" #include "content/public/browser/browser_context.h" class PrefRegistrySimple; diff --git a/brightray/browser/browser_main_parts.cc b/brightray/browser/browser_main_parts.cc index 54f8a60d4d02..d2356efbad83 100644 --- a/brightray/browser/browser_main_parts.cc +++ b/brightray/browser/browser_main_parts.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#include "browser/browser_main_parts.h" +#include "brightray/browser/browser_main_parts.h" -#include "browser/browser_context.h" -#include "browser/devtools_manager_delegate.h" -#include "browser/web_ui_controller_factory.h" -#include "common/main_delegate.h" +#include "brightray/browser/browser_context.h" +#include "brightray/browser/devtools_manager_delegate.h" +#include "brightray/browser/web_ui_controller_factory.h" +#include "brightray/common/main_delegate.h" #include "base/command_line.h" #include "base/feature_list.h" @@ -28,7 +28,7 @@ #endif #if defined(TOOLKIT_VIEWS) -#include "browser/views/views_delegate.h" +#include "brightray/browser/views/views_delegate.h" #endif #if defined(USE_X11) @@ -36,7 +36,7 @@ #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 "brightray/browser/brightray_paths.h" #include "chrome/browser/ui/libgtkui/gtk_ui.h" #include "ui/base/x/x11_util.h" #include "ui/base/x/x11_util_internal.h" diff --git a/brightray/browser/browser_main_parts_mac.mm b/brightray/browser/browser_main_parts_mac.mm index 1df09f20e79c..5e80eca442be 100644 --- a/brightray/browser/browser_main_parts_mac.mm +++ b/brightray/browser/browser_main_parts_mac.mm @@ -1,4 +1,4 @@ -#import "browser_main_parts.h" +#import "brightray/browser/browser_main_parts.h" #import "base/logging.h" #import "base/mac/bundle_locations.h" diff --git a/brightray/browser/devtools_contents_resizing_strategy.cc b/brightray/browser/devtools_contents_resizing_strategy.cc index 30ee028669e3..65ffed7e4e48 100644 --- a/brightray/browser/devtools_contents_resizing_strategy.cc +++ b/brightray/browser/devtools_contents_resizing_strategy.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/devtools_contents_resizing_strategy.h" +#include "brightray/browser/devtools_contents_resizing_strategy.h" #include diff --git a/brightray/browser/devtools_embedder_message_dispatcher.cc b/brightray/browser/devtools_embedder_message_dispatcher.cc index 13c54c4c7eca..06764f6740d2 100644 --- a/brightray/browser/devtools_embedder_message_dispatcher.cc +++ b/brightray/browser/devtools_embedder_message_dispatcher.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#include "browser/devtools_embedder_message_dispatcher.h" +#include "brightray/browser/devtools_embedder_message_dispatcher.h" #include "base/bind.h" #include "base/values.h" diff --git a/brightray/browser/devtools_file_system_indexer.cc b/brightray/browser/devtools_file_system_indexer.cc index d906f0d0bb64..977c0b31d985 100644 --- a/brightray/browser/devtools_file_system_indexer.cc +++ b/brightray/browser/devtools_file_system_indexer.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/devtools_file_system_indexer.h" +#include "brightray/browser/devtools_file_system_indexer.h" #include diff --git a/brightray/browser/devtools_manager_delegate.cc b/brightray/browser/devtools_manager_delegate.cc index 28fdbf27466b..f6ba60f9f581 100644 --- a/brightray/browser/devtools_manager_delegate.cc +++ b/brightray/browser/devtools_manager_delegate.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#include "browser/devtools_manager_delegate.h" +#include "brightray/browser/devtools_manager_delegate.h" #include @@ -12,8 +12,8 @@ #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 "brightray/browser/net/devtools_network_protocol_handler.h" +#include "brightray/common/content_client.h" #include "content/public/browser/devtools_agent_host.h" #include "content/public/browser/devtools_frontend_host.h" #include "content/public/browser/devtools_socket_factory.h" diff --git a/brightray/browser/devtools_ui.cc b/brightray/browser/devtools_ui.cc index 9764886d571a..9029dd2944f5 100644 --- a/brightray/browser/devtools_ui.cc +++ b/brightray/browser/devtools_ui.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#include "browser/devtools_ui.h" +#include "brightray/browser/devtools_ui.h" #include diff --git a/brightray/browser/inspectable_web_contents.cc b/brightray/browser/inspectable_web_contents.cc index 74aeac671136..cea73a0915c6 100644 --- a/brightray/browser/inspectable_web_contents.cc +++ b/brightray/browser/inspectable_web_contents.cc @@ -1,6 +1,6 @@ -#include "browser/inspectable_web_contents.h" +#include "brightray/browser/inspectable_web_contents.h" -#include "browser/inspectable_web_contents_impl.h" +#include "brightray/browser/inspectable_web_contents_impl.h" namespace brightray { diff --git a/brightray/browser/inspectable_web_contents_impl.cc b/brightray/browser/inspectable_web_contents_impl.cc index 1b103eb7f68c..a72f1b9e265e 100644 --- a/brightray/browser/inspectable_web_contents_impl.cc +++ b/brightray/browser/inspectable_web_contents_impl.cc @@ -3,7 +3,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#include "browser/inspectable_web_contents_impl.h" +#include "brightray/browser/inspectable_web_contents_impl.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" @@ -12,12 +12,12 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" -#include "browser/browser_client.h" -#include "browser/browser_context.h" -#include "browser/browser_main_parts.h" -#include "browser/inspectable_web_contents_delegate.h" -#include "browser/inspectable_web_contents_view.h" -#include "browser/inspectable_web_contents_view_delegate.h" +#include "brightray/browser/browser_client.h" +#include "brightray/browser/browser_context.h" +#include "brightray/browser/browser_main_parts.h" +#include "brightray/browser/inspectable_web_contents_delegate.h" +#include "brightray/browser/inspectable_web_contents_view.h" +#include "brightray/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" diff --git a/brightray/browser/inspectable_web_contents_impl.h b/brightray/browser/inspectable_web_contents_impl.h index e5187dd5c9dd..e3b603686b52 100644 --- a/brightray/browser/inspectable_web_contents_impl.h +++ b/brightray/browser/inspectable_web_contents_impl.h @@ -11,9 +11,9 @@ #include #include "base/memory/weak_ptr.h" -#include "browser/devtools_contents_resizing_strategy.h" -#include "browser/devtools_embedder_message_dispatcher.h" -#include "browser/inspectable_web_contents.h" +#include "brightray/browser/devtools_contents_resizing_strategy.h" +#include "brightray/browser/devtools_embedder_message_dispatcher.h" +#include "brightray/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" diff --git a/brightray/browser/inspectable_web_contents_view_delegate.cc b/brightray/browser/inspectable_web_contents_view_delegate.cc index 5906499da8c4..86cba6b22ff1 100644 --- a/brightray/browser/inspectable_web_contents_view_delegate.cc +++ b/brightray/browser/inspectable_web_contents_view_delegate.cc @@ -1,4 +1,4 @@ -#include "browser/inspectable_web_contents_view_delegate.h" +#include "brightray/browser/inspectable_web_contents_view_delegate.h" namespace brightray { diff --git a/brightray/browser/inspectable_web_contents_view_mac.h b/brightray/browser/inspectable_web_contents_view_mac.h index 8d6d7b23a471..990fdf58c939 100644 --- a/brightray/browser/inspectable_web_contents_view_mac.h +++ b/brightray/browser/inspectable_web_contents_view_mac.h @@ -1,7 +1,7 @@ #ifndef BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_VIEW_MAC_H_ #define BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_VIEW_MAC_H_ -#include "browser/inspectable_web_contents_view.h" +#include "brightray/browser/inspectable_web_contents_view.h" #include "base/mac/scoped_nsobject.h" diff --git a/brightray/browser/inspectable_web_contents_view_mac.mm b/brightray/browser/inspectable_web_contents_view_mac.mm index 94edc1c1a716..0dadde0c0691 100644 --- a/brightray/browser/inspectable_web_contents_view_mac.mm +++ b/brightray/browser/inspectable_web_contents_view_mac.mm @@ -1,11 +1,11 @@ -#include "browser/inspectable_web_contents_view_mac.h" +#include "brightray/browser/inspectable_web_contents_view_mac.h" #import #include "base/strings/sys_string_conversions.h" -#include "browser/inspectable_web_contents.h" -#include "browser/inspectable_web_contents_view_delegate.h" -#import "browser/mac/bry_inspectable_web_contents_view.h" +#include "brightray/browser/inspectable_web_contents.h" +#include "brightray/browser/inspectable_web_contents_view_delegate.h" +#import "brightray/browser/mac/bry_inspectable_web_contents_view.h" namespace brightray { diff --git a/brightray/browser/linux/libnotify_loader.cc b/brightray/browser/linux/libnotify_loader.cc index 5510bc23cf3b..016f49864d96 100644 --- a/brightray/browser/linux/libnotify_loader.cc +++ b/brightray/browser/linux/libnotify_loader.cc @@ -2,7 +2,7 @@ // Path to the code generator: // tools/generate_library_loader/generate_library_loader.py . -#include "browser/linux/libnotify_loader.h" +#include "brightray/browser/linux/libnotify_loader.h" #include diff --git a/brightray/browser/linux/libnotify_notification.cc b/brightray/browser/linux/libnotify_notification.cc index dad3acb4335d..9706fbd3d692 100644 --- a/brightray/browser/linux/libnotify_notification.cc +++ b/brightray/browser/linux/libnotify_notification.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "browser/linux/libnotify_notification.h" +#include "brightray/browser/linux/libnotify_notification.h" #include "base/files/file_enumerator.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "browser/notification_delegate.h" +#include "brightray/browser/notification_delegate.h" +#include "brightray/common/application_info.h" #include "chrome/browser/ui/libgtkui/skia_utils_gtk.h" -#include "common/application_info.h" #include "third_party/skia/include/core/SkBitmap.h" namespace brightray { diff --git a/brightray/browser/linux/libnotify_notification.h b/brightray/browser/linux/libnotify_notification.h index ebe28739e94a..b6163ae9b56f 100644 --- a/brightray/browser/linux/libnotify_notification.h +++ b/brightray/browser/linux/libnotify_notification.h @@ -7,8 +7,8 @@ #include -#include "browser/linux/libnotify_loader.h" -#include "browser/notification.h" +#include "brightray/browser/linux/libnotify_loader.h" +#include "brightray/browser/notification.h" #include "ui/base/glib/glib_signal.h" namespace brightray { diff --git a/brightray/browser/linux/notification_presenter_linux.cc b/brightray/browser/linux/notification_presenter_linux.cc index 6df5ebaaec90..fd010f213061 100644 --- a/brightray/browser/linux/notification_presenter_linux.cc +++ b/brightray/browser/linux/notification_presenter_linux.cc @@ -3,9 +3,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#include "browser/linux/notification_presenter_linux.h" +#include "brightray/browser/linux/notification_presenter_linux.h" -#include "browser/linux/libnotify_notification.h" +#include "brightray/browser/linux/libnotify_notification.h" namespace brightray { diff --git a/brightray/browser/linux/notification_presenter_linux.h b/brightray/browser/linux/notification_presenter_linux.h index 143717091d77..ed387624219a 100644 --- a/brightray/browser/linux/notification_presenter_linux.h +++ b/brightray/browser/linux/notification_presenter_linux.h @@ -6,7 +6,7 @@ #ifndef BRIGHTRAY_BROWSER_LINUX_NOTIFICATION_PRESENTER_LINUX_H_ #define BRIGHTRAY_BROWSER_LINUX_NOTIFICATION_PRESENTER_LINUX_H_ -#include "browser/notification_presenter.h" +#include "brightray/browser/notification_presenter.h" namespace brightray { diff --git a/brightray/browser/mac/bry_inspectable_web_contents_view.h b/brightray/browser/mac/bry_inspectable_web_contents_view.h index c9a8dce615a7..c243b30fc473 100644 --- a/brightray/browser/mac/bry_inspectable_web_contents_view.h +++ b/brightray/browser/mac/bry_inspectable_web_contents_view.h @@ -1,7 +1,7 @@ #import #include "base/mac/scoped_nsobject.h" -#include "browser/devtools_contents_resizing_strategy.h" +#include "brightray/browser/devtools_contents_resizing_strategy.h" #include "ui/base/cocoa/base_view.h" namespace brightray { diff --git a/brightray/browser/mac/bry_inspectable_web_contents_view.mm b/brightray/browser/mac/bry_inspectable_web_contents_view.mm index 7ee36b0e9284..bb94774d7d24 100644 --- a/brightray/browser/mac/bry_inspectable_web_contents_view.mm +++ b/brightray/browser/mac/bry_inspectable_web_contents_view.mm @@ -1,9 +1,9 @@ -#include "browser/mac/bry_inspectable_web_contents_view.h" +#include "brightray/browser/mac/bry_inspectable_web_contents_view.h" -#include "browser/inspectable_web_contents_impl.h" -#include "browser/inspectable_web_contents_view_delegate.h" -#include "browser/inspectable_web_contents_view_mac.h" -#include "browser/mac/event_dispatching_window.h" +#include "brightray/browser/inspectable_web_contents_impl.h" +#include "brightray/browser/inspectable_web_contents_view_delegate.h" +#include "brightray/browser/inspectable_web_contents_view_mac.h" +#include "brightray/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" diff --git a/brightray/browser/mac/cocoa_notification.h b/brightray/browser/mac/cocoa_notification.h index 7ad5c0973b1c..e95b490a70ad 100644 --- a/brightray/browser/mac/cocoa_notification.h +++ b/brightray/browser/mac/cocoa_notification.h @@ -10,7 +10,7 @@ #include #include "base/mac/scoped_nsobject.h" -#include "browser/notification.h" +#include "brightray/browser/notification.h" namespace brightray { diff --git a/brightray/browser/mac/cocoa_notification.mm b/brightray/browser/mac/cocoa_notification.mm index f4599487c846..354dc8d484b8 100644 --- a/brightray/browser/mac/cocoa_notification.mm +++ b/brightray/browser/mac/cocoa_notification.mm @@ -2,12 +2,12 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "browser/mac/cocoa_notification.h" +#include "brightray/browser/mac/cocoa_notification.h" #include "base/mac/mac_util.h" #include "base/strings/sys_string_conversions.h" -#include "browser/notification_delegate.h" -#include "browser/notification_presenter.h" +#include "brightray/browser/notification_delegate.h" +#include "brightray/browser/notification_presenter.h" #include "skia/ext/skia_utils_mac.h" namespace brightray { diff --git a/brightray/browser/mac/event_dispatching_window.mm b/brightray/browser/mac/event_dispatching_window.mm index 08e8edebb0b9..55707174a55e 100644 --- a/brightray/browser/mac/event_dispatching_window.mm +++ b/brightray/browser/mac/event_dispatching_window.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "browser/mac/event_dispatching_window.h" +#include "brightray/browser/mac/event_dispatching_window.h" @implementation EventDispatchingWindow diff --git a/brightray/browser/mac/notification_center_delegate.mm b/brightray/browser/mac/notification_center_delegate.mm index fd77e0685e4b..42632cd8a9d7 100644 --- a/brightray/browser/mac/notification_center_delegate.mm +++ b/brightray/browser/mac/notification_center_delegate.mm @@ -2,10 +2,10 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "browser/mac/notification_center_delegate.h" +#include "brightray/browser/mac/notification_center_delegate.h" -#include "browser/mac/cocoa_notification.h" -#include "browser/mac/notification_presenter_mac.h" +#include "brightray/browser/mac/cocoa_notification.h" +#include "brightray/browser/mac/notification_presenter_mac.h" @implementation NotificationCenterDelegate diff --git a/brightray/browser/mac/notification_presenter_mac.h b/brightray/browser/mac/notification_presenter_mac.h index f0781609846e..0e0e42048cf9 100644 --- a/brightray/browser/mac/notification_presenter_mac.h +++ b/brightray/browser/mac/notification_presenter_mac.h @@ -7,8 +7,8 @@ #define BRIGHTRAY_BROWSER_MAC_NOTIFICATION_PRESENTER_MAC_H_ #include "base/mac/scoped_nsobject.h" -#include "browser/mac/notification_center_delegate.h" -#include "browser/notification_presenter.h" +#include "brightray/browser/mac/notification_center_delegate.h" +#include "brightray/browser/notification_presenter.h" namespace brightray { diff --git a/brightray/browser/mac/notification_presenter_mac.mm b/brightray/browser/mac/notification_presenter_mac.mm index fec4c1a05394..5afadab7ebb4 100644 --- a/brightray/browser/mac/notification_presenter_mac.mm +++ b/brightray/browser/mac/notification_presenter_mac.mm @@ -2,10 +2,10 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "browser/mac/notification_presenter_mac.h" +#include "brightray/browser/mac/notification_presenter_mac.h" -#include "browser/mac/cocoa_notification.h" -#include "browser/mac/notification_center_delegate.h" +#include "brightray/browser/mac/cocoa_notification.h" +#include "brightray/browser/mac/notification_center_delegate.h" namespace brightray { diff --git a/brightray/browser/media/media_capture_devices_dispatcher.cc b/brightray/browser/media/media_capture_devices_dispatcher.cc index 93ec53557d33..8d122890b773 100644 --- a/brightray/browser/media/media_capture_devices_dispatcher.cc +++ b/brightray/browser/media/media_capture_devices_dispatcher.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#include "browser/media/media_capture_devices_dispatcher.h" +#include "brightray/browser/media/media_capture_devices_dispatcher.h" #include "base/logging.h" #include "content/public/browser/browser_thread.h" diff --git a/brightray/browser/media/media_device_id_salt.cc b/brightray/browser/media/media_device_id_salt.cc index 612449b25de8..87e4aaaec23a 100644 --- a/brightray/browser/media/media_device_id_salt.cc +++ b/brightray/browser/media/media_device_id_salt.cc @@ -1,7 +1,7 @@ // Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/media/media_device_id_salt.h" +#include "brightray/browser/media/media_device_id_salt.h" #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h" diff --git a/brightray/browser/media/media_stream_devices_controller.cc b/brightray/browser/media/media_stream_devices_controller.cc index 18f19d12a042..d96b73c1e34e 100644 --- a/brightray/browser/media/media_stream_devices_controller.cc +++ b/brightray/browser/media/media_stream_devices_controller.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#include "browser/media/media_stream_devices_controller.h" +#include "brightray/browser/media/media_stream_devices_controller.h" -#include "browser/media/media_capture_devices_dispatcher.h" +#include "brightray/browser/media/media_capture_devices_dispatcher.h" #include "content/public/browser/desktop_media_id.h" #include "content/public/common/media_stream_request.h" diff --git a/brightray/browser/net/devtools_network_conditions.cc b/brightray/browser/net/devtools_network_conditions.cc index 0005c7f56c74..7405ed942603 100644 --- a/brightray/browser/net/devtools_network_conditions.cc +++ b/brightray/browser/net/devtools_network_conditions.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/net/devtools_network_conditions.h" +#include "brightray/browser/net/devtools_network_conditions.h" namespace brightray { diff --git a/brightray/browser/net/devtools_network_controller.cc b/brightray/browser/net/devtools_network_controller.cc index 66afca63c27c..bd37e61d9477 100644 --- a/brightray/browser/net/devtools_network_controller.cc +++ b/brightray/browser/net/devtools_network_controller.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#include "browser/net/devtools_network_controller.h" +#include "brightray/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 "brightray/browser/net/devtools_network_conditions.h" +#include "brightray/browser/net/devtools_network_interceptor.h" +#include "brightray/browser/net/devtools_network_transaction.h" #include "content/public/browser/browser_thread.h" using content::BrowserThread; diff --git a/brightray/browser/net/devtools_network_controller_handle.cc b/brightray/browser/net/devtools_network_controller_handle.cc index 44b7b9c6c14d..8d167a1e515f 100644 --- a/brightray/browser/net/devtools_network_controller_handle.cc +++ b/brightray/browser/net/devtools_network_controller_handle.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#include "browser/net/devtools_network_controller_handle.h" +#include "brightray/browser/net/devtools_network_controller_handle.h" #include "base/bind.h" -#include "browser/net/devtools_network_conditions.h" -#include "browser/net/devtools_network_controller.h" +#include "brightray/browser/net/devtools_network_conditions.h" +#include "brightray/browser/net/devtools_network_controller.h" #include "content/public/browser/browser_thread.h" using content::BrowserThread; diff --git a/brightray/browser/net/devtools_network_interceptor.cc b/brightray/browser/net/devtools_network_interceptor.cc index 73e8538310db..8fec4c45db4e 100644 --- a/brightray/browser/net/devtools_network_interceptor.cc +++ b/brightray/browser/net/devtools_network_interceptor.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/net/devtools_network_interceptor.h" +#include "brightray/browser/net/devtools_network_interceptor.h" #include #include #include "base/time/time.h" -#include "browser/net/devtools_network_conditions.h" +#include "brightray/browser/net/devtools_network_conditions.h" #include "net/base/net_errors.h" namespace brightray { diff --git a/brightray/browser/net/devtools_network_protocol_handler.cc b/brightray/browser/net/devtools_network_protocol_handler.cc index c846609a56e0..9378620cbe6c 100644 --- a/brightray/browser/net/devtools_network_protocol_handler.cc +++ b/brightray/browser/net/devtools_network_protocol_handler.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#include "browser/net/devtools_network_protocol_handler.h" +#include "brightray/browser/net/devtools_network_protocol_handler.h" #include #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 "brightray/browser/browser_context.h" +#include "brightray/browser/net/devtools_network_conditions.h" +#include "brightray/browser/net/devtools_network_controller.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/devtools_agent_host.h" diff --git a/brightray/browser/net/devtools_network_transaction.cc b/brightray/browser/net/devtools_network_transaction.cc index 1e42a623e9e3..bc446186d985 100644 --- a/brightray/browser/net/devtools_network_transaction.cc +++ b/brightray/browser/net/devtools_network_transaction.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#include "browser/net/devtools_network_transaction.h" +#include "brightray/browser/net/devtools_network_transaction.h" #include -#include "browser/net/devtools_network_controller.h" -#include "browser/net/devtools_network_upload_data_stream.h" +#include "brightray/browser/net/devtools_network_controller.h" +#include "brightray/browser/net/devtools_network_upload_data_stream.h" #include "net/base/load_timing_info.h" #include "net/base/net_errors.h" #include "net/base/upload_progress.h" diff --git a/brightray/browser/net/devtools_network_transaction.h b/brightray/browser/net/devtools_network_transaction.h index e9ee54e2513e..aadf55209015 100644 --- a/brightray/browser/net/devtools_network_transaction.h +++ b/brightray/browser/net/devtools_network_transaction.h @@ -8,7 +8,7 @@ #include #include "base/memory/weak_ptr.h" -#include "browser/net/devtools_network_interceptor.h" +#include "brightray/browser/net/devtools_network_interceptor.h" #include "net/base/completion_callback.h" #include "net/base/load_states.h" #include "net/base/request_priority.h" diff --git a/brightray/browser/net/devtools_network_transaction_factory.cc b/brightray/browser/net/devtools_network_transaction_factory.cc index c21aae5066b6..98c7bb57e8a4 100644 --- a/brightray/browser/net/devtools_network_transaction_factory.cc +++ b/brightray/browser/net/devtools_network_transaction_factory.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#include "browser/net/devtools_network_transaction_factory.h" +#include "brightray/browser/net/devtools_network_transaction_factory.h" #include #include -#include "browser/net/devtools_network_controller.h" -#include "browser/net/devtools_network_transaction.h" +#include "brightray/browser/net/devtools_network_controller.h" +#include "brightray/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" diff --git a/brightray/browser/net/devtools_network_upload_data_stream.cc b/brightray/browser/net/devtools_network_upload_data_stream.cc index 6687038b097f..73a375418759 100644 --- a/brightray/browser/net/devtools_network_upload_data_stream.cc +++ b/brightray/browser/net/devtools_network_upload_data_stream.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/net/devtools_network_upload_data_stream.h" +#include "brightray/browser/net/devtools_network_upload_data_stream.h" #include "net/base/net_errors.h" diff --git a/brightray/browser/net/devtools_network_upload_data_stream.h b/brightray/browser/net/devtools_network_upload_data_stream.h index ecc4b2c39ae9..1f2921b61daa 100644 --- a/brightray/browser/net/devtools_network_upload_data_stream.h +++ b/brightray/browser/net/devtools_network_upload_data_stream.h @@ -9,7 +9,7 @@ #include "base/macros.h" #include "base/memory/weak_ptr.h" -#include "browser/net/devtools_network_interceptor.h" +#include "brightray/browser/net/devtools_network_interceptor.h" #include "net/base/upload_data_stream.h" namespace brightray { diff --git a/brightray/browser/net_log.cc b/brightray/browser/net_log.cc index 6b41eb738c1b..4b810c8995f5 100644 --- a/brightray/browser/net_log.cc +++ b/brightray/browser/net_log.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "browser/net_log.h" +#include "brightray/browser/net_log.h" #include "base/command_line.h" #include "base/files/file_path.h" diff --git a/brightray/browser/network_delegate.cc b/brightray/browser/network_delegate.cc index f7be1b028b68..aca32af16b33 100644 --- a/brightray/browser/network_delegate.cc +++ b/brightray/browser/network_delegate.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#include "browser/network_delegate.h" +#include "brightray/browser/network_delegate.h" #include #include diff --git a/brightray/browser/notification.cc b/brightray/browser/notification.cc index ba9df5446f30..8f7bef979478 100644 --- a/brightray/browser/notification.cc +++ b/brightray/browser/notification.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "browser/notification.h" +#include "brightray/browser/notification.h" -#include "browser/notification_delegate.h" -#include "browser/notification_presenter.h" +#include "brightray/browser/notification_delegate.h" +#include "brightray/browser/notification_presenter.h" namespace brightray { diff --git a/brightray/browser/notification_delegate_adapter.cc b/brightray/browser/notification_delegate_adapter.cc index c0ad3d03f066..60405f9ef8d4 100644 --- a/brightray/browser/notification_delegate_adapter.cc +++ b/brightray/browser/notification_delegate_adapter.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "browser/notification_delegate_adapter.h" +#include "brightray/browser/notification_delegate_adapter.h" namespace brightray { diff --git a/brightray/browser/notification_delegate_adapter.h b/brightray/browser/notification_delegate_adapter.h index 78a3e3c4daaa..1bb7197bd2ed 100644 --- a/brightray/browser/notification_delegate_adapter.h +++ b/brightray/browser/notification_delegate_adapter.h @@ -8,7 +8,7 @@ #include #include "base/macros.h" -#include "browser/notification_delegate.h" +#include "brightray/browser/notification_delegate.h" namespace brightray { diff --git a/brightray/browser/notification_presenter.cc b/brightray/browser/notification_presenter.cc index 30ef3b16b4b2..5384fcdb09bc 100644 --- a/brightray/browser/notification_presenter.cc +++ b/brightray/browser/notification_presenter.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "browser/notification_presenter.h" +#include "brightray/browser/notification_presenter.h" -#include "browser/notification.h" +#include "brightray/browser/notification.h" namespace brightray { diff --git a/brightray/browser/permission_manager.cc b/brightray/browser/permission_manager.cc index 198e35d8c38c..630775648f0f 100644 --- a/brightray/browser/permission_manager.cc +++ b/brightray/browser/permission_manager.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#include "browser/permission_manager.h" +#include "brightray/browser/permission_manager.h" #include "base/callback.h" #include "content/public/browser/child_process_security_policy.h" diff --git a/brightray/browser/platform_notification_service.cc b/brightray/browser/platform_notification_service.cc index b9ac0b787cfb..1c88a7461d5f 100644 --- a/brightray/browser/platform_notification_service.cc +++ b/brightray/browser/platform_notification_service.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#include "browser/platform_notification_service.h" +#include "brightray/browser/platform_notification_service.h" -#include "browser/browser_client.h" -#include "browser/notification.h" -#include "browser/notification_delegate_adapter.h" -#include "browser/notification_presenter.h" +#include "brightray/browser/browser_client.h" +#include "brightray/browser/notification.h" +#include "brightray/browser/notification_delegate_adapter.h" +#include "brightray/browser/notification_presenter.h" #include "content/public/common/notification_resources.h" #include "content/public/common/platform_notification_data.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/brightray/browser/special_storage_policy.cc b/brightray/browser/special_storage_policy.cc index 2010dbd1a041..af12ebe08148 100644 --- a/brightray/browser/special_storage_policy.cc +++ b/brightray/browser/special_storage_policy.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/special_storage_policy.h" +#include "brightray/browser/special_storage_policy.h" namespace brightray { diff --git a/brightray/browser/url_request_context_getter.cc b/brightray/browser/url_request_context_getter.cc index de11498398cf..3db62729a673 100644 --- a/brightray/browser/url_request_context_getter.cc +++ b/brightray/browser/url_request_context_getter.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#include "browser/url_request_context_getter.h" +#include "brightray/browser/url_request_context_getter.h" #include @@ -12,11 +12,11 @@ #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 "brightray/browser/net/devtools_network_controller_handle.h" +#include "brightray/browser/net/devtools_network_transaction_factory.h" +#include "brightray/browser/net_log.h" +#include "brightray/browser/network_delegate.h" +#include "brightray/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" diff --git a/brightray/browser/views/views_delegate.cc b/brightray/browser/views/views_delegate.cc index 99797dea4adc..ac9b1d619bdc 100644 --- a/brightray/browser/views/views_delegate.cc +++ b/brightray/browser/views/views_delegate.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#include "browser/views/views_delegate.h" +#include "brightray/browser/views/views_delegate.h" #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" #include "ui/views/widget/native_widget_aura.h" diff --git a/brightray/browser/web_ui_controller_factory.cc b/brightray/browser/web_ui_controller_factory.cc index 8cebff1855de..c87b92b8705c 100644 --- a/brightray/browser/web_ui_controller_factory.cc +++ b/brightray/browser/web_ui_controller_factory.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#include "browser/web_ui_controller_factory.h" +#include "brightray/browser/web_ui_controller_factory.h" #include "base/memory/singleton.h" -#include "browser/devtools_ui.h" +#include "brightray/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" diff --git a/brightray/browser/win/notification_presenter_win.cc b/brightray/browser/win/notification_presenter_win.cc index acb4b22932c0..a14a60aaa904 100644 --- a/brightray/browser/win/notification_presenter_win.cc +++ b/brightray/browser/win/notification_presenter_win.cc @@ -4,7 +4,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#include "browser/win/notification_presenter_win.h" +#include "brightray/browser/win/notification_presenter_win.h" #include #include @@ -13,8 +13,8 @@ #include "base/md5.h" #include "base/strings/utf_string_conversions.h" #include "base/win/windows_version.h" -#include "browser/win/notification_presenter_win7.h" -#include "browser/win/windows_toast_notification.h" +#include "brightray/browser/win/notification_presenter_win7.h" +#include "brightray/browser/win/windows_toast_notification.h" #include "content/public/browser/desktop_notification_delegate.h" #include "content/public/common/platform_notification_data.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/brightray/browser/win/notification_presenter_win.h b/brightray/browser/win/notification_presenter_win.h index 679490c18521..2a1a779bfa3d 100644 --- a/brightray/browser/win/notification_presenter_win.h +++ b/brightray/browser/win/notification_presenter_win.h @@ -25,7 +25,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/strings/string16.h" -#include "browser/notification_presenter.h" +#include "brightray/browser/notification_presenter.h" class GURL; class SkBitmap; diff --git a/brightray/browser/win/notification_presenter_win7.cc b/brightray/browser/win/notification_presenter_win7.cc index 05286946e3e2..cc37cf505f81 100644 --- a/brightray/browser/win/notification_presenter_win7.cc +++ b/brightray/browser/win/notification_presenter_win7.cc @@ -1,8 +1,8 @@ -#include "browser/win/notification_presenter_win7.h" +#include "brightray/browser/win/notification_presenter_win7.h" #include -#include "browser/win/win32_notification.h" +#include "brightray/browser/win/win32_notification.h" namespace brightray { diff --git a/brightray/browser/win/notification_presenter_win7.h b/brightray/browser/win/notification_presenter_win7.h index c191439befcc..ecd1cb28f98a 100644 --- a/brightray/browser/win/notification_presenter_win7.h +++ b/brightray/browser/win/notification_presenter_win7.h @@ -1,6 +1,6 @@ #pragma once -#include "browser/notification_presenter.h" -#include "browser/win/win32_desktop_notifications/desktop_notification_controller.h" +#include "brightray/browser/notification_presenter.h" +#include "brightray/browser/win/win32_desktop_notifications/desktop_notification_controller.h" namespace brightray { diff --git a/brightray/browser/win/scoped_hstring.cc b/brightray/browser/win/scoped_hstring.cc index 082ebe762270..fda8cce86c1d 100644 --- a/brightray/browser/win/scoped_hstring.cc +++ b/brightray/browser/win/scoped_hstring.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#include "browser/win/scoped_hstring.h" +#include "brightray/browser/win/scoped_hstring.h" #include diff --git a/brightray/browser/win/win32_desktop_notifications/desktop_notification_controller.cc b/brightray/browser/win/win32_desktop_notifications/desktop_notification_controller.cc index 68068a6de26e..0b5c9ec44fe2 100644 --- a/brightray/browser/win/win32_desktop_notifications/desktop_notification_controller.cc +++ b/brightray/browser/win/win32_desktop_notifications/desktop_notification_controller.cc @@ -1,11 +1,11 @@ #define NOMINMAX #define WIN32_LEAN_AND_MEAN -#include "browser/win/win32_desktop_notifications/desktop_notification_controller.h" +#include "brightray/browser/win/win32_desktop_notifications/desktop_notification_controller.h" #include #include #include -#include "browser/win/win32_desktop_notifications/common.h" -#include "browser/win/win32_desktop_notifications/toast.h" +#include "brightray/browser/win/win32_desktop_notifications/common.h" +#include "brightray/browser/win/win32_desktop_notifications/toast.h" using std::make_shared; using std::shared_ptr; diff --git a/brightray/browser/win/win32_desktop_notifications/toast.cc b/brightray/browser/win/win32_desktop_notifications/toast.cc index 1ab968c3ef0b..cfe8ebf9a921 100644 --- a/brightray/browser/win/win32_desktop_notifications/toast.cc +++ b/brightray/browser/win/win32_desktop_notifications/toast.cc @@ -1,9 +1,9 @@ #define NOMINMAX -#include "browser/win/win32_desktop_notifications/toast.h" +#include "brightray/browser/win/win32_desktop_notifications/toast.h" #include #include #include -#include "browser/win/win32_desktop_notifications/common.h" +#include "brightray/browser/win/win32_desktop_notifications/common.h" #pragma comment(lib, "msimg32.lib") #pragma comment(lib, "uxtheme.lib") diff --git a/brightray/browser/win/win32_desktop_notifications/toast.h b/brightray/browser/win/win32_desktop_notifications/toast.h index bb9bd9fa4aed..2a49a38b1473 100644 --- a/brightray/browser/win/win32_desktop_notifications/toast.h +++ b/brightray/browser/win/win32_desktop_notifications/toast.h @@ -1,5 +1,5 @@ #pragma once -#include "browser/win/win32_desktop_notifications/desktop_notification_controller.h" +#include "brightray/browser/win/win32_desktop_notifications/desktop_notification_controller.h" namespace brightray { diff --git a/brightray/browser/win/win32_notification.cc b/brightray/browser/win/win32_notification.cc index 8c80c9d37a90..21e3b6ce8fa6 100644 --- a/brightray/browser/win/win32_notification.cc +++ b/brightray/browser/win/win32_notification.cc @@ -1,6 +1,6 @@ #define WIN32_LEAN_AND_MEAN -#include "browser/win/win32_notification.h" +#include "brightray/browser/win/win32_notification.h" #include #include diff --git a/brightray/browser/win/win32_notification.h b/brightray/browser/win/win32_notification.h index 9a418cd50371..ce0ba3a0925d 100644 --- a/brightray/browser/win/win32_notification.h +++ b/brightray/browser/win/win32_notification.h @@ -1,6 +1,6 @@ #pragma once -#include "browser/notification.h" -#include "browser/win/notification_presenter_win7.h" +#include "brightray/browser/notification.h" +#include "brightray/browser/win/notification_presenter_win7.h" namespace brightray { diff --git a/brightray/browser/win/windows_toast_notification.cc b/brightray/browser/win/windows_toast_notification.cc index c5f25d546879..5b5b7764ebd9 100644 --- a/brightray/browser/win/windows_toast_notification.cc +++ b/brightray/browser/win/windows_toast_notification.cc @@ -6,15 +6,15 @@ // this code // and released it as MIT to the world. -#include "browser/win/windows_toast_notification.h" +#include "brightray/browser/win/windows_toast_notification.h" #include #include "base/strings/utf_string_conversions.h" -#include "browser/notification_delegate.h" -#include "browser/win/notification_presenter_win.h" -#include "browser/win/scoped_hstring.h" -#include "common/application_info.h" +#include "brightray/browser/notification_delegate.h" +#include "brightray/browser/win/notification_presenter_win.h" +#include "brightray/browser/win/scoped_hstring.h" +#include "brightray/common/application_info.h" #include "content/public/browser/browser_thread.h" using ABI::Windows::Data::Xml::Dom::IXmlAttribute; diff --git a/brightray/browser/win/windows_toast_notification.h b/brightray/browser/win/windows_toast_notification.h index 3b32170183ba..b36a5cc3797d 100644 --- a/brightray/browser/win/windows_toast_notification.h +++ b/brightray/browser/win/windows_toast_notification.h @@ -14,7 +14,7 @@ #include #include -#include "browser/notification.h" +#include "brightray/browser/notification.h" using Microsoft::WRL::ClassicCom; using Microsoft::WRL::ComPtr; diff --git a/brightray/browser/zoom_level_delegate.cc b/brightray/browser/zoom_level_delegate.cc index 0b8f373970bb..c295c3f064e6 100644 --- a/brightray/browser/zoom_level_delegate.cc +++ b/brightray/browser/zoom_level_delegate.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/zoom_level_delegate.h" +#include "brightray/browser/zoom_level_delegate.h" #include #include diff --git a/brightray/common/application_info_mac.mm b/brightray/common/application_info_mac.mm index 6472bc054542..a4b40898a048 100644 --- a/brightray/common/application_info_mac.mm +++ b/brightray/common/application_info_mac.mm @@ -1,8 +1,8 @@ -#import "common/application_info.h" +#import "brightray/common/application_info.h" #import "base/mac/foundation_util.h" #import "base/strings/sys_string_conversions.h" -#import "common/mac/main_application_bundle.h" +#import "brightray/common/mac/main_application_bundle.h" namespace brightray { diff --git a/brightray/common/application_info_win.cc b/brightray/common/application_info_win.cc index 69358305d081..aa0ed280387e 100644 --- a/brightray/common/application_info_win.cc +++ b/brightray/common/application_info_win.cc @@ -1,4 +1,4 @@ -#include "common/application_info.h" +#include "brightray/common/application_info.h" #include diff --git a/brightray/common/content_client.cc b/brightray/common/content_client.cc index 5bc94a127edb..71668e5d0930 100644 --- a/brightray/common/content_client.cc +++ b/brightray/common/content_client.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#include "common/content_client.h" +#include "brightray/common/content_client.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" -#include "common/application_info.h" +#include "brightray/common/application_info.h" #include "content/public/common/user_agent.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/brightray/common/mac/main_application_bundle.mm b/brightray/common/mac/main_application_bundle.mm index 3e386b40dc58..a581c94df7e5 100644 --- a/brightray/common/mac/main_application_bundle.mm +++ b/brightray/common/mac/main_application_bundle.mm @@ -3,7 +3,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#import "common/mac/main_application_bundle.h" +#import "brightray/common/mac/main_application_bundle.h" #include "base/files/file_path.h" #include "base/mac/bundle_locations.h" diff --git a/brightray/common/main_delegate.cc b/brightray/common/main_delegate.cc index 60b1a1dd7e6e..423794d80279 100644 --- a/brightray/common/main_delegate.cc +++ b/brightray/common/main_delegate.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#include "common/main_delegate.h" +#include "brightray/common/main_delegate.h" #include #include "base/command_line.h" #include "base/path_service.h" -#include "browser/browser_client.h" -#include "common/content_client.h" +#include "brightray/browser/browser_client.h" +#include "brightray/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" diff --git a/brightray/common/main_delegate_mac.mm b/brightray/common/main_delegate_mac.mm index fb59ccd67a39..0d7b81175535 100644 --- a/brightray/common/main_delegate_mac.mm +++ b/brightray/common/main_delegate_mac.mm @@ -12,8 +12,8 @@ #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 "brightray/common/application_info.h" +#include "brightray/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" diff --git a/brightray/common/switches.cc b/brightray/common/switches.cc index fb281de82822..9985f9f15e0b 100644 --- a/brightray/common/switches.cc +++ b/brightray/common/switches.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "common/switches.h" +#include "brightray/common/switches.h" namespace brightray { From 278a283801374ef29254bb6b7e93a4cc0d289f29 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 18 May 2017 15:59:41 -0700 Subject: [PATCH 10/16] :art: Group includes --- brightray/browser/browser_main_parts.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/brightray/browser/browser_main_parts.cc b/brightray/browser/browser_main_parts.cc index d2356efbad83..b8d4496d9ab4 100644 --- a/brightray/browser/browser_main_parts.cc +++ b/brightray/browser/browser_main_parts.cc @@ -4,15 +4,14 @@ #include "brightray/browser/browser_main_parts.h" -#include "brightray/browser/browser_context.h" -#include "brightray/browser/devtools_manager_delegate.h" -#include "brightray/browser/web_ui_controller_factory.h" -#include "brightray/common/main_delegate.h" - #include "base/command_line.h" #include "base/feature_list.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" +#include "brightray/browser/browser_context.h" +#include "brightray/browser/devtools_manager_delegate.h" +#include "brightray/browser/web_ui_controller_factory.h" +#include "brightray/common/main_delegate.h" #include "content/public/browser/browser_thread.h" #include "content/public/common/content_switches.h" #include "media/base/localized_strings.h" From 4625159310647822b151dd96c2ed325ecbb9d283 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 18 May 2017 16:04:05 -0700 Subject: [PATCH 11/16] Add memory include for std::unique_ptr --- brightray/browser/browser_main_parts.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/brightray/browser/browser_main_parts.h b/brightray/browser/browser_main_parts.h index 42b49923d2fb..b8de2fdde67a 100644 --- a/brightray/browser/browser_main_parts.h +++ b/brightray/browser/browser_main_parts.h @@ -5,6 +5,8 @@ #ifndef BRIGHTRAY_BROWSER_BROWSER_MAIN_PARTS_H_ #define BRIGHTRAY_BROWSER_BROWSER_MAIN_PARTS_H_ +#include + #include "base/compiler_specific.h" #include "base/macros.h" #include "content/public/browser/browser_main_parts.h" From e19eef025d603680b870c93c707e6c6d53e20718 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 18 May 2017 16:11:12 -0700 Subject: [PATCH 12/16] Remove lint from inspectable_web_contents_view_views.h/cc --- .../views/inspectable_web_contents_view_views.cc | 9 ++++----- .../views/inspectable_web_contents_view_views.h | 11 +++++------ 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/brightray/browser/views/inspectable_web_contents_view_views.cc b/brightray/browser/views/inspectable_web_contents_view_views.cc index 8f52ca569952..39827f2a6a69 100644 --- a/brightray/browser/views/inspectable_web_contents_view_views.cc +++ b/brightray/browser/views/inspectable_web_contents_view_views.cc @@ -1,10 +1,9 @@ -#include "browser/views/inspectable_web_contents_view_views.h" - -#include "browser/inspectable_web_contents_delegate.h" -#include "browser/inspectable_web_contents_impl.h" -#include "browser/inspectable_web_contents_view_delegate.h" +#include "brightray/browser/views/inspectable_web_contents_view_views.h" #include "base/strings/utf_string_conversions.h" +#include "brightray/browser/inspectable_web_contents_delegate.h" +#include "brightray/browser/inspectable_web_contents_impl.h" +#include "brightray/browser/inspectable_web_contents_view_delegate.h" #include "ui/views/controls/label.h" #include "ui/views/controls/webview/webview.h" #include "ui/views/widget/widget.h" diff --git a/brightray/browser/views/inspectable_web_contents_view_views.h b/brightray/browser/views/inspectable_web_contents_view_views.h index 9094b9f35dc9..848e7dcdb3fe 100644 --- a/brightray/browser/views/inspectable_web_contents_view_views.h +++ b/brightray/browser/views/inspectable_web_contents_view_views.h @@ -1,10 +1,9 @@ -#ifndef BROWSER_VIEWS_INSPECTABLE_WEB_CONTENTS_VIEW_VIEWS_H_ -#define BROWSER_VIEWS_INSPECTABLE_WEB_CONTENTS_VIEW_VIEWS_H_ - -#include "browser/devtools_contents_resizing_strategy.h" -#include "browser/inspectable_web_contents_view.h" +#ifndef BRIGHTRAY_BROWSER_VIEWS_INSPECTABLE_WEB_CONTENTS_VIEW_VIEWS_H_ +#define BRIGHTRAY_BROWSER_VIEWS_INSPECTABLE_WEB_CONTENTS_VIEW_VIEWS_H_ #include "base/compiler_specific.h" +#include "brightray/browser/devtools_contents_resizing_strategy.h" +#include "brightray/browser/inspectable_web_contents_view.h" #include "ui/views/view.h" namespace views { @@ -64,4 +63,4 @@ class InspectableWebContentsViewViews : public InspectableWebContentsView, } // namespace brightray -#endif // BROWSER_VIEWS_INSPECTABLE_WEB_CONTENTS_VIEW_VIEWS_H_ +#endif // BRIGHTRAY_BROWSER_VIEWS_INSPECTABLE_WEB_CONTENTS_VIEW_VIEWS_H_ From 43f7520d4f8b57bbb391a975b1b740742b478079 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 18 May 2017 16:19:11 -0700 Subject: [PATCH 13/16] Add missing brightray prefix --- atom/browser/net/url_request_fetch_job.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atom/browser/net/url_request_fetch_job.h b/atom/browser/net/url_request_fetch_job.h index 75689c8908d3..5bd11e9ca4d7 100644 --- a/atom/browser/net/url_request_fetch_job.h +++ b/atom/browser/net/url_request_fetch_job.h @@ -8,7 +8,7 @@ #include #include "atom/browser/net/js_asker.h" -#include "browser/url_request_context_getter.h" +#include "brightray/browser/url_request_context_getter.h" #include "content/browser/streams/stream.h" #include "content/browser/streams/stream_read_observer.h" #include "net/url_request/url_fetcher_delegate.h" From 7aacf786d6afcf46e4cf9f7cd957fa4efab9958f Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 18 May 2017 16:30:20 -0700 Subject: [PATCH 14/16] Remove unneeded brightray folder from include dirs --- electron.gyp | 1 - 1 file changed, 1 deletion(-) diff --git a/electron.gyp b/electron.gyp index e0c91c151fd9..73638836f54d 100644 --- a/electron.gyp +++ b/electron.gyp @@ -245,7 +245,6 @@ 'include_dirs': [ '.', 'chromium_src', - 'brightray', 'vendor/native_mate', # Include atom_natives.h. '<(SHARED_INTERMEDIATE_DIR)', From 7e185ef1a3d21463e0b9cab0c00aa86d7a6a3c98 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 18 May 2017 16:51:50 -0700 Subject: [PATCH 15/16] Remove extra newlines --- brightray/browser/devtools_contents_resizing_strategy.cc | 1 - brightray/browser/devtools_embedder_message_dispatcher.cc | 1 - brightray/browser/net/devtools_network_protocol_handler.cc | 1 - brightray/browser/views/views_delegate.cc | 1 - brightray/browser/views/views_delegate.h | 2 -- brightray/browser/win/win32_desktop_notifications/common.h | 1 - .../desktop_notification_controller.cc | 2 -- brightray/common/main_delegate_mac.mm | 1 - 8 files changed, 10 deletions(-) diff --git a/brightray/browser/devtools_contents_resizing_strategy.cc b/brightray/browser/devtools_contents_resizing_strategy.cc index 65ffed7e4e48..2f729ba16aaf 100644 --- a/brightray/browser/devtools_contents_resizing_strategy.cc +++ b/brightray/browser/devtools_contents_resizing_strategy.cc @@ -17,7 +17,6 @@ DevToolsContentsResizingStrategy::DevToolsContentsResizingStrategy( !bounds_.y()) { } - void DevToolsContentsResizingStrategy::CopyFrom( const DevToolsContentsResizingStrategy& strategy) { bounds_ = strategy.bounds(); diff --git a/brightray/browser/devtools_embedder_message_dispatcher.cc b/brightray/browser/devtools_embedder_message_dispatcher.cc index 06764f6740d2..d8c550460414 100644 --- a/brightray/browser/devtools_embedder_message_dispatcher.cc +++ b/brightray/browser/devtools_embedder_message_dispatcher.cc @@ -145,7 +145,6 @@ class DispatcherImpl : public DevToolsEmbedderMessageDispatcher { base::Unretained(delegate))); } - private: using Handler = base::Callback; diff --git a/brightray/browser/net/devtools_network_protocol_handler.cc b/brightray/browser/net/devtools_network_protocol_handler.cc index 9378620cbe6c..c291de7bef45 100644 --- a/brightray/browser/net/devtools_network_protocol_handler.cc +++ b/brightray/browser/net/devtools_network_protocol_handler.cc @@ -39,7 +39,6 @@ const char kError[] = "error"; // JSON RPC 2.0 spec: http://www.jsonrpc.org/specification#error_object const int kErrorInvalidParams = -32602; - bool ParseCommand(const base::DictionaryValue* command, int* id, std::string* method, diff --git a/brightray/browser/views/views_delegate.cc b/brightray/browser/views/views_delegate.cc index ac9b1d619bdc..750af7ef271c 100644 --- a/brightray/browser/views/views_delegate.cc +++ b/brightray/browser/views/views_delegate.cc @@ -100,7 +100,6 @@ void ViewsDelegate::OnBeforeWidgetInit( } } - bool ViewsDelegate::WindowManagerProvidesTitleBar(bool maximized) { #if defined(OS_LINUX) // On Ubuntu Unity, the system always provides a title bar for maximized diff --git a/brightray/browser/views/views_delegate.h b/brightray/browser/views/views_delegate.h index a764f8c16e3d..ae3f16d100a3 100644 --- a/brightray/browser/views/views_delegate.h +++ b/brightray/browser/views/views_delegate.h @@ -59,8 +59,6 @@ class ViewsDelegate : public views::ViewsDelegate { DISALLOW_COPY_AND_ASSIGN(ViewsDelegate); }; - - } // namespace brightray #endif // BRIGHTRAY_BROWSER_VIEWS_VIEWS_DELEGATE_H_ diff --git a/brightray/browser/win/win32_desktop_notifications/common.h b/brightray/browser/win/win32_desktop_notifications/common.h index ef364ceb4ccb..b978c82579a4 100644 --- a/brightray/browser/win/win32_desktop_notifications/common.h +++ b/brightray/browser/win/win32_desktop_notifications/common.h @@ -10,7 +10,6 @@ struct NotificationData { std::wstring body_text; HBITMAP image = NULL; - NotificationData() = default; ~NotificationData() { diff --git a/brightray/browser/win/win32_desktop_notifications/desktop_notification_controller.cc b/brightray/browser/win/win32_desktop_notifications/desktop_notification_controller.cc index 0b5c9ec44fe2..543c90e10336 100644 --- a/brightray/browser/win/win32_desktop_notifications/desktop_notification_controller.cc +++ b/brightray/browser/win/win32_desktop_notifications/desktop_notification_controller.cc @@ -344,7 +344,6 @@ void DesktopNotificationController::DestroyToast(ToastInstance& inst) { } } - DesktopNotificationController::Notification::Notification( const shared_ptr& data) : data_(data) { @@ -389,7 +388,6 @@ void DesktopNotificationController::Notification::Set( data_->controller->StartAnimation(); } - DesktopNotificationController::NotificationLink::NotificationLink( DesktopNotificationController* controller) : shared_ptr(make_shared()) { diff --git a/brightray/common/main_delegate_mac.mm b/brightray/common/main_delegate_mac.mm index 0d7b81175535..fcf470698c8c 100644 --- a/brightray/common/main_delegate_mac.mm +++ b/brightray/common/main_delegate_mac.mm @@ -5,7 +5,6 @@ #import "main_delegate.h" - #include "base/command_line.h" #include "base/mac/bundle_locations.h" #include "base/mac/foundation_util.h" From 09a3e2671676eac5602886c9cd38d26b264a5c49 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 18 May 2017 16:53:12 -0700 Subject: [PATCH 16/16] Add full prefix to main_delegate.h include --- brightray/common/main_delegate_mac.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/brightray/common/main_delegate_mac.mm b/brightray/common/main_delegate_mac.mm index fcf470698c8c..99c449878711 100644 --- a/brightray/common/main_delegate_mac.mm +++ b/brightray/common/main_delegate_mac.mm @@ -3,7 +3,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#import "main_delegate.h" +#import "brightray/common/main_delegate.h" #include "base/command_line.h" #include "base/mac/bundle_locations.h"