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" diff --git a/brightray/CPPLINT.cfg b/brightray/CPPLINT.cfg index 01e99482f2b0..c9bbb2e5968e 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=-legal/copyright,+build/include_alpha 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/brightray_paths.h b/brightray/browser/brightray_paths.h index 14c51ca8f229..b12b10d08f3c 100644 --- a/brightray/browser/brightray_paths.h +++ b/brightray/browser/brightray_paths.h @@ -2,10 +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_ - -#include "base/compiler_specific.h" +#ifndef BRIGHTRAY_BROWSER_BRIGHTRAY_PATHS_H_ +#define BRIGHTRAY_BROWSER_BRIGHTRAY_PATHS_H_ #if defined(OS_WIN) #include "base/base_paths_win.h" @@ -42,4 +40,4 @@ enum { } // namespace brightray -#endif // BROWSER_BRIGHTRAY_PATHS_H_ +#endif // BRIGHTRAY_BROWSER_BRIGHTRAY_PATHS_H_ 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 574103b91ca3..cc162242f751 100644 --- a/brightray/browser/browser_client.h +++ b/brightray/browser/browser_client.h @@ -5,13 +5,14 @@ #ifndef BRIGHTRAY_BROWSER_BROWSER_CLIENT_H_ #define BRIGHTRAY_BROWSER_BROWSER_CLIENT_H_ -#include "browser/net_log.h" -#include "content/public/browser/browser_context.h" +#include +#include + +#include "brightray/browser/net_log.h" #include "content/public/browser/content_browser_client.h" namespace brightray { -class BrowserContext; class BrowserMainParts; class NotificationPresenter; class PlatformNotificationService; @@ -66,4 +67,4 @@ class BrowserClient : public content::ContentBrowserClient { } // namespace brightray -#endif +#endif // BRIGHTRAY_BROWSER_BROWSER_CLIENT_H_ diff --git a/brightray/browser/browser_context.cc b/brightray/browser/browser_context.cc index 88e8bd40848a..a1781e0c6a20 100644 --- a/brightray/browser/browser_context.cc +++ b/brightray/browser/browser_context.cc @@ -2,27 +2,23 @@ // 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 "browser/media/media_device_id_salt.h" -#include "browser/brightray_paths.h" -#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" +#include "brightray/browser/browser_context.h" #include "base/files/file_path.h" #include "base/path_service.h" - +#include "base/strings/string_util.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" #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 704cfb9f33c6..e740f4579f6b 100644 --- a/brightray/browser/browser_context.h +++ b/brightray/browser/browser_context.h @@ -6,13 +6,13 @@ #define BRIGHTRAY_BROWSER_BROWSER_CONTEXT_H_ #include - -#include "browser/net/devtools_network_controller_handle.h" -#include "browser/permission_manager.h" -#include "browser/url_request_context_getter.h" +#include #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.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; @@ -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.cc b/brightray/browser/browser_main_parts.cc index 8d46b4af4b4c..b8d4496d9ab4 100644 --- a/brightray/browser/browser_main_parts.cc +++ b/brightray/browser/browser_main_parts.cc @@ -2,17 +2,16 @@ // 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 "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_main_parts.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" @@ -28,15 +27,15 @@ #endif #if defined(TOOLKIT_VIEWS) -#include "browser/views/views_delegate.h" +#include "brightray/browser/views/views_delegate.h" #endif #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 "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.h b/brightray/browser/browser_main_parts.h index ab9b086d786b..b8de2fdde67a 100644 --- a/brightray/browser/browser_main_parts.h +++ b/brightray/browser/browser_main_parts.h @@ -5,8 +5,10 @@ #ifndef BRIGHTRAY_BROWSER_BROWSER_MAIN_PARTS_H_ #define BRIGHTRAY_BROWSER_BROWSER_MAIN_PARTS_H_ +#include + #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) @@ -57,4 +59,4 @@ class BrowserMainParts : public content::BrowserMainParts { } // namespace brightray -#endif +#endif // BRIGHTRAY_BROWSER_BROWSER_MAIN_PARTS_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..2f729ba16aaf 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 @@ -17,7 +17,6 @@ DevToolsContentsResizingStrategy::DevToolsContentsResizingStrategy( !bounds_.y()) { } - void DevToolsContentsResizingStrategy::CopyFrom( const DevToolsContentsResizingStrategy& strategy) { bounds_ = strategy.bounds(); 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_embedder_message_dispatcher.cc b/brightray/browser/devtools_embedder_message_dispatcher.cc index 13c54c4c7eca..d8c550460414 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" @@ -145,7 +145,6 @@ class DispatcherImpl : public DevToolsEmbedderMessageDispatcher { base::Unretained(delegate))); } - private: using Handler = base::Callback; diff --git a/brightray/browser/devtools_file_system_indexer.cc b/brightray/browser/devtools_file_system_indexer.cc index e41830258fdc..977c0b31d985 100644 --- a/brightray/browser/devtools_file_system_indexer.cc +++ b/brightray/browser/devtools_file_system_indexer.cc @@ -2,20 +2,20 @@ // 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 +#include #include +#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_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.cc b/brightray/browser/devtools_manager_delegate.cc index 7d4ae4d7d459..f6ba60f9f581 100644 --- a/brightray/browser/devtools_manager_delegate.cc +++ b/brightray/browser/devtools_manager_delegate.cc @@ -2,19 +2,18 @@ // 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 -#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 "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" @@ -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 2e2e09f43f5c..f20c32050eeb 100644 --- a/brightray/browser/devtools_manager_delegate.h +++ b/brightray/browser/devtools_manager_delegate.h @@ -2,12 +2,13 @@ // 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 -#include "base/macros.h" #include "base/compiler_specific.h" -#include "content/browser/devtools/devtools_http_handler.h" +#include "base/macros.h" #include "content/public/browser/devtools_manager_delegate.h" namespace brightray { @@ -39,4 +40,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.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/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.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.h b/brightray/browser/inspectable_web_contents.h index 44c0c22ec647..28c00f6d72df 100644 --- a/brightray/browser/inspectable_web_contents.h +++ b/brightray/browser/inspectable_web_contents.h @@ -1,5 +1,7 @@ -#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 #include "content/public/browser/web_contents.h" @@ -50,4 +52,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.cc b/brightray/browser/inspectable_web_contents_impl.cc index 20ee3081558a..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,15 +12,15 @@ #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" -#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 25cffa957aff..e3b603686b52 100644 --- a/brightray/browser/inspectable_web_contents_impl.h +++ b/brightray/browser/inspectable_web_contents_impl.h @@ -6,12 +6,14 @@ #ifndef BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_IMPL_H_ #define BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_IMPL_H_ -#include "browser/inspectable_web_contents.h" - -#include "browser/devtools_contents_resizing_strategy.h" -#include "browser/devtools_embedder_message_dispatcher.h" +#include +#include +#include #include "base/memory/weak_ptr.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" @@ -22,10 +24,6 @@ class PrefService; class PrefRegistrySimple; -namespace content { -class DevToolsAgentHost; -} - namespace brightray { class InspectableWebContentsDelegate; @@ -199,4 +197,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.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_delegate.h b/brightray/browser/inspectable_web_contents_view_delegate.h index 900857c7a108..1f30735497c4 100644 --- a/brightray/browser/inspectable_web_contents_view_delegate.h +++ b/brightray/browser/inspectable_web_contents_view_delegate.h @@ -1,5 +1,7 @@ -#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 #include "ui/gfx/image/image_skia.h" @@ -25,4 +27,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..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" @@ -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/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_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/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 cb9384cb0e0c..b6163ae9b56f 100644 --- a/brightray/browser/linux/libnotify_notification.h +++ b/brightray/browser/linux/libnotify_notification.h @@ -2,11 +2,13 @@ // 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" +#include + +#include "brightray/browser/linux/libnotify_loader.h" +#include "brightray/browser/notification.h" #include "ui/base/glib/glib_signal.h" namespace brightray { @@ -41,4 +43,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.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 a90f31ea60ef..ed387624219a 100644 --- a/brightray/browser/linux/notification_presenter_linux.h +++ b/brightray/browser/linux/notification_presenter_linux.h @@ -3,10 +3,10 @@ // 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" +#include "brightray/browser/notification_presenter.h" namespace brightray { @@ -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/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/browser/mac/bry_inspectable_web_contents_view.h b/brightray/browser/mac/bry_inspectable_web_contents_view.h index 9819f2d767e4..c243b30fc473 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 "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 25e7083948ba..bb94774d7d24 100644 --- a/brightray/browser/mac/bry_inspectable_web_contents_view.mm +++ b/brightray/browser/mac/bry_inspectable_web_contents_view.mm @@ -1,10 +1,9 @@ -#include "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/mac/bry_inspectable_web_contents_view.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 f6ec9e9da6b0..e95b490a70ad 100644 --- a/brightray/browser/mac/cocoa_notification.h +++ b/brightray/browser/mac/cocoa_notification.h @@ -2,13 +2,15 @@ // 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 +#include + #include "base/mac/scoped_nsobject.h" -#include "browser/notification.h" +#include "brightray/browser/notification.h" namespace brightray { @@ -39,4 +41,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/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 514a27625eab..0e0e42048cf9 100644 --- a/brightray/browser/mac/notification_presenter_mac.h +++ b/brightray/browser/mac/notification_presenter_mac.h @@ -3,12 +3,12 @@ // 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" -#include "browser/notification_presenter.h" +#include "brightray/browser/mac/notification_center_delegate.h" +#include "brightray/browser/notification_presenter.h" namespace brightray { @@ -33,4 +33,4 @@ class NotificationPresenterMac : public NotificationPresenter { } // namespace brightray -#endif +#endif // BRIGHTRAY_BROWSER_MAC_NOTIFICATION_PRESENTER_MAC_H_ 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_capture_devices_dispatcher.h b/brightray/browser/media/media_capture_devices_dispatcher.h index dbbd66d25800..32f3b60ff8b0 100644 --- a/brightray/browser/media/media_capture_devices_dispatcher.h +++ b/brightray/browser/media/media_capture_devices_dispatcher.h @@ -5,10 +5,10 @@ #ifndef BRIGHTRAY_BROWSER_MEDIA_MEDIA_CAPTURE_DEVICES_DISPATCHER_H_ #define BRIGHTRAY_BROWSER_MEDIA_MEDIA_CAPTURE_DEVICES_DISPATCHER_H_ -#include "base/callback.h" +#include + #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.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_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.cc b/brightray/browser/media/media_stream_devices_controller.cc index c01749ab43d2..d96b73c1e34e 100644 --- a/brightray/browser/media/media_stream_devices_controller.cc +++ b/brightray/browser/media/media_stream_devices_controller.cc @@ -2,10 +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 "browser/media/media_capture_devices_dispatcher.h" +#include "brightray/browser/media/media_stream_devices_controller.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/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.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_conditions.h b/brightray/browser/net/devtools_network_conditions.h index 81aae86f8d49..f9885ba4680c 100644 --- a/brightray/browser/net/devtools_network_conditions.h +++ b/brightray/browser/net/devtools_network_conditions.h @@ -2,14 +2,10 @@ // 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_ - -#include -#include +#ifndef BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_CONDITIONS_H_ +#define BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_CONDITIONS_H_ #include "base/macros.h" -#include "url/gurl.h" namespace brightray { @@ -40,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.cc b/brightray/browser/net/devtools_network_controller.cc index 8bf411ac1a4e..bd37e61d9477 100644 --- a/brightray/browser/net/devtools_network_controller.cc +++ b/brightray/browser/net/devtools_network_controller.cc @@ -2,13 +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 "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_controller.h" #include "base/bind.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.h b/brightray/browser/net/devtools_network_controller.h index c36d888df110..1ba5bf308691 100644 --- a/brightray/browser/net/devtools_network_controller.h +++ b/brightray/browser/net/devtools_network_controller.h @@ -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. -#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 #include +#include #include "base/macros.h" #include "base/threading/thread_checker.h" @@ -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.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_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.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_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.cc b/brightray/browser/net/devtools_network_protocol_handler.cc index 58988577b432..c291de7bef45 100644 --- a/brightray/browser/net/devtools_network_protocol_handler.cc +++ b/brightray/browser/net/devtools_network_protocol_handler.cc @@ -2,17 +2,17 @@ // 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 "browser/browser_context.h" -#include "browser/net/devtools_network_conditions.h" -#include "browser/net/devtools_network_controller.h" +#include #include "base/strings/stringprintf.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" - namespace brightray { namespace { @@ -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/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.cc b/brightray/browser/net/devtools_network_transaction.cc index ced70acc5e4a..bc446186d985 100644 --- a/brightray/browser/net/devtools_network_transaction.cc +++ b/brightray/browser/net/devtools_network_transaction.cc @@ -2,10 +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 "browser/net/devtools_network_controller.h" -#include "browser/net/devtools_network_upload_data_stream.h" +#include + +#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 7f01d73cad1e..aadf55209015 100644 --- a/brightray/browser/net/devtools_network_transaction.h +++ b/brightray/browser/net/devtools_network_transaction.h @@ -2,18 +2,17 @@ // 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 #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" #include "net/http/http_transaction.h" -#include "net/websockets/websocket_handshake_stream_base.h" namespace brightray { @@ -105,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.cc b/brightray/browser/net/devtools_network_transaction_factory.cc index 7373c14ddeff..98c7bb57e8a4 100644 --- a/brightray/browser/net/devtools_network_transaction_factory.cc +++ b/brightray/browser/net/devtools_network_transaction_factory.cc @@ -2,11 +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 "browser/net/devtools_network_controller.h" -#include "browser/net/devtools_network_transaction.h" +#include +#include +#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_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.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 c3753e8286f5..1f2921b61daa 100644 --- a/brightray/browser/net/devtools_network_upload_data_stream.h +++ b/brightray/browser/net/devtools_network_upload_data_stream.h @@ -2,15 +2,14 @@ // 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 #include "base/macros.h" #include "base/memory/weak_ptr.h" -#include "browser/net/devtools_network_interceptor.h" -#include "net/base/completion_callback.h" +#include "brightray/browser/net/devtools_network_interceptor.h" #include "net/base/upload_data_stream.h" namespace brightray { @@ -48,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.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/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.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/network_delegate.h b/brightray/browser/network_delegate.h index b8a8b5225368..6f9e13e2ea48 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 { @@ -77,4 +76,4 @@ class NetworkDelegate : public net::NetworkDelegate { } // namespace brightray -#endif +#endif // BRIGHTRAY_BROWSER_NETWORK_DELEGATE_H_ 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.h b/brightray/browser/notification.h index a330bc25d1b8..e59cab7a0cd4 100644 --- a/brightray/browser/notification.h +++ b/brightray/browser/notification.h @@ -2,8 +2,10 @@ // 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 #include "base/memory/weak_ptr.h" #include "base/strings/string16.h" @@ -62,4 +64,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.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 01f3284e2b85..1bb7197bd2ed 100644 --- a/brightray/browser/notification_delegate_adapter.h +++ b/brightray/browser/notification_delegate_adapter.h @@ -2,13 +2,13 @@ // 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 #include "base/macros.h" -#include "browser/notification_delegate.h" +#include "brightray/browser/notification_delegate.h" namespace brightray { @@ -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.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/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.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/permission_manager.h b/brightray/browser/permission_manager.h index 734529f06eb4..da39fdd91bde 100644 --- a/brightray/browser/permission_manager.h +++ b/brightray/browser/permission_manager.h @@ -2,8 +2,10 @@ // 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 #include "base/callback_forward.h" #include "base/macros.h" @@ -54,4 +56,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.cc b/brightray/browser/platform_notification_service.cc index 36c515153537..1c88a7461d5f 100644 --- a/brightray/browser/platform_notification_service.cc +++ b/brightray/browser/platform_notification_service.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/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 "content/public/common/platform_notification_data.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" namespace brightray { diff --git a/brightray/browser/platform_notification_service.h b/brightray/browser/platform_notification_service.h index f9b09c64bdff..298bb3eeff7e 100644 --- a/brightray/browser/platform_notification_service.h +++ b/brightray/browser/platform_notification_service.h @@ -2,8 +2,11 @@ // 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 +#include #include "content/public/browser/browser_context.h" #include "content/public/browser/platform_notification_service.h" @@ -58,4 +61,4 @@ class PlatformNotificationService } // namespace brightray -#endif // BROWSER_PLATFORM_NOTIFICATION_SERVICE_H_ +#endif // BRIGHTRAY_BROWSER_PLATFORM_NOTIFICATION_SERVICE_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 209260ace1c3..3db62729a673 100644 --- a/brightray/browser/url_request_context_getter.cc +++ b/brightray/browser/url_request_context_getter.cc @@ -2,22 +2,21 @@ // 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 -#include "browser/net/devtools_network_controller_handle.h" -#include "browser/net/devtools_network_transaction_factory.h" -#include "browser/net_log.h" -#include "browser/network_delegate.h" -#include "common/switches.h" - #include "base/command_line.h" #include "base/memory/ptr_util.h" -#include "base/strings/string_util.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_util.h" #include "base/threading/sequenced_worker_pool.h" #include "base/threading/worker_pool.h" +#include "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" @@ -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" @@ -307,7 +306,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/browser/url_request_context_getter.h b/brightray/browser/url_request_context_getter.h index dab7ae1e8728..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" @@ -120,4 +123,4 @@ class URLRequestContextGetter : public net::URLRequestContextGetter { } // namespace brightray -#endif +#endif // BRIGHTRAY_BROWSER_URL_REQUEST_CONTEXT_GETTER_H_ 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_ diff --git a/brightray/browser/views/views_delegate.cc b/brightray/browser/views/views_delegate.cc index 99797dea4adc..750af7ef271c 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" @@ -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 d63eeb533d67..ae3f16d100a3 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" @@ -57,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/web_ui_controller_factory.cc b/brightray/browser/web_ui_controller_factory.cc index 565c0258883a..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 "browser/devtools_ui.h" #include "base/memory/singleton.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/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/browser/win/notification_presenter_win.cc b/brightray/browser/win/notification_presenter_win.cc index 930775c792b2..a14a60aaa904 100644 --- a/brightray/browser/win/notification_presenter_win.cc +++ b/brightray/browser/win/notification_presenter_win.cc @@ -4,14 +4,17 @@ // 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 #include "base/files/file_util.h" #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 f002c476d5a9..cc37cf505f81 100644 --- a/brightray/browser/win/notification_presenter_win7.cc +++ b/brightray/browser/win/notification_presenter_win7.cc @@ -1,5 +1,8 @@ -#include "browser/win/notification_presenter_win7.h" -#include "browser/win/win32_notification.h" +#include "brightray/browser/win/notification_presenter_win7.h" + +#include + +#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/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 68068a6de26e..543c90e10336 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; @@ -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/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 5b6093658aac..21e3b6ce8fa6 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 "brightray/browser/win/win32_notification.h" + #include +#include + #include "third_party/skia/include/core/SkBitmap.h" namespace brightray { 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 0e0c9249c11e..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/scoped_hstring.h" -#include "browser/win/notification_presenter_win.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 47c7d596a88b..b36a5cc3797d 100644 --- a/brightray/browser/win/windows_toast_notification.h +++ b/brightray/browser/win/windows_toast_notification.h @@ -12,8 +12,9 @@ #include #include #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 7148b18e18a4..c295c3f064e6 100644 --- a/brightray/browser/zoom_level_delegate.cc +++ b/brightray/browser/zoom_level_delegate.cc @@ -2,9 +2,10 @@ // 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 #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/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/application_info_mac.mm b/brightray/common/application_info_mac.mm index 6898b6376deb..a4b40898a048 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 "common/mac/foundation_util.h" -#import "common/mac/main_application_bundle.h" +#import "brightray/common/application_info.h" +#import "base/mac/foundation_util.h" #import "base/strings/sys_string_conversions.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 22635711cb48..aa0ed280387e 100644 --- a/brightray/common/application_info_win.cc +++ b/brightray/common/application_info_win.cc @@ -1,6 +1,6 @@ -#include +#include "brightray/common/application_info.h" -#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 ebe066be613d..71668e5d0930 100644 --- a/brightray/common/content_client.cc +++ b/brightray/common/content_client.cc @@ -2,12 +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 "common/application_info.h" - -#include "base/strings/stringprintf.h" #include "base/strings/string_util.h" +#include "base/strings/stringprintf.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/content_client.h b/brightray/common/content_client.h index 4d1d6238c954..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" @@ -31,4 +33,4 @@ class ContentClient : public content::ContentClient { } // namespace brightray -#endif +#endif // BRIGHTRAY_COMMON_CONTENT_CLIENT_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/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/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 4551ddfa0aa1..423794d80279 100644 --- a/brightray/common/main_delegate.cc +++ b/brightray/common/main_delegate.cc @@ -2,15 +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 "browser/browser_client.h" -#include "common/content_client.h" - #include "base/command_line.h" #include "base/path_service.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.h b/brightray/common/main_delegate.h index 2f63a2fb1b1a..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" @@ -60,4 +61,5 @@ class MainDelegate : public content::ContentMainDelegate { }; } // namespace brightray -#endif + +#endif // BRIGHTRAY_COMMON_MAIN_DELEGATE_H_ diff --git a/brightray/common/main_delegate_mac.mm b/brightray/common/main_delegate_mac.mm index 29040840ce33..99c449878711 100644 --- a/brightray/common/main_delegate_mac.mm +++ b/brightray/common/main_delegate_mac.mm @@ -3,17 +3,16 @@ // 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" - -#include "common/application_info.h" -#include "common/mac/foundation_util.h" -#include "common/mac/main_application_bundle.h" +#import "brightray/common/main_delegate.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 "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 17ca05857739..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 { @@ -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 diff --git a/brightray/filenames.gypi b/brightray/filenames.gypi index b7d44013b847..f8f89ea94b6f 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', @@ -116,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', 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)', 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__)))