Browse Source

Add brightray prefix to include paths from within brightray

Kevin Sawicki 8 years ago
parent
commit
d7321ed980
76 changed files with 171 additions and 172 deletions
  1. 1 2
      brightray/brightray.gyp
  2. 7 7
      brightray/browser/browser_client.cc
  3. 1 1
      brightray/browser/browser_client.h
  4. 9 9
      brightray/browser/browser_context.cc
  5. 3 3
      brightray/browser/browser_context.h
  6. 7 7
      brightray/browser/browser_main_parts.cc
  7. 1 1
      brightray/browser/browser_main_parts_mac.mm
  8. 1 1
      brightray/browser/devtools_contents_resizing_strategy.cc
  9. 1 1
      brightray/browser/devtools_embedder_message_dispatcher.cc
  10. 1 1
      brightray/browser/devtools_file_system_indexer.cc
  11. 3 3
      brightray/browser/devtools_manager_delegate.cc
  12. 1 1
      brightray/browser/devtools_ui.cc
  13. 2 2
      brightray/browser/inspectable_web_contents.cc
  14. 7 7
      brightray/browser/inspectable_web_contents_impl.cc
  15. 3 3
      brightray/browser/inspectable_web_contents_impl.h
  16. 1 1
      brightray/browser/inspectable_web_contents_view_delegate.cc
  17. 1 1
      brightray/browser/inspectable_web_contents_view_mac.h
  18. 4 4
      brightray/browser/inspectable_web_contents_view_mac.mm
  19. 1 1
      brightray/browser/linux/libnotify_loader.cc
  20. 3 3
      brightray/browser/linux/libnotify_notification.cc
  21. 2 2
      brightray/browser/linux/libnotify_notification.h
  22. 2 2
      brightray/browser/linux/notification_presenter_linux.cc
  23. 1 1
      brightray/browser/linux/notification_presenter_linux.h
  24. 1 1
      brightray/browser/mac/bry_inspectable_web_contents_view.h
  25. 5 5
      brightray/browser/mac/bry_inspectable_web_contents_view.mm
  26. 1 1
      brightray/browser/mac/cocoa_notification.h
  27. 3 3
      brightray/browser/mac/cocoa_notification.mm
  28. 1 1
      brightray/browser/mac/event_dispatching_window.mm
  29. 3 3
      brightray/browser/mac/notification_center_delegate.mm
  30. 2 2
      brightray/browser/mac/notification_presenter_mac.h
  31. 3 3
      brightray/browser/mac/notification_presenter_mac.mm
  32. 1 1
      brightray/browser/media/media_capture_devices_dispatcher.cc
  33. 1 1
      brightray/browser/media/media_device_id_salt.cc
  34. 2 2
      brightray/browser/media/media_stream_devices_controller.cc
  35. 1 1
      brightray/browser/net/devtools_network_conditions.cc
  36. 4 4
      brightray/browser/net/devtools_network_controller.cc
  37. 3 3
      brightray/browser/net/devtools_network_controller_handle.cc
  38. 2 2
      brightray/browser/net/devtools_network_interceptor.cc
  39. 4 4
      brightray/browser/net/devtools_network_protocol_handler.cc
  40. 3 3
      brightray/browser/net/devtools_network_transaction.cc
  41. 1 1
      brightray/browser/net/devtools_network_transaction.h
  42. 3 3
      brightray/browser/net/devtools_network_transaction_factory.cc
  43. 1 1
      brightray/browser/net/devtools_network_upload_data_stream.cc
  44. 1 1
      brightray/browser/net/devtools_network_upload_data_stream.h
  45. 1 1
      brightray/browser/net_log.cc
  46. 1 1
      brightray/browser/network_delegate.cc
  47. 3 3
      brightray/browser/notification.cc
  48. 1 1
      brightray/browser/notification_delegate_adapter.cc
  49. 1 1
      brightray/browser/notification_delegate_adapter.h
  50. 2 2
      brightray/browser/notification_presenter.cc
  51. 1 1
      brightray/browser/permission_manager.cc
  52. 5 5
      brightray/browser/platform_notification_service.cc
  53. 1 1
      brightray/browser/special_storage_policy.cc
  54. 6 6
      brightray/browser/url_request_context_getter.cc
  55. 1 1
      brightray/browser/views/views_delegate.cc
  56. 2 2
      brightray/browser/web_ui_controller_factory.cc
  57. 3 3
      brightray/browser/win/notification_presenter_win.cc
  58. 1 1
      brightray/browser/win/notification_presenter_win.h
  59. 2 2
      brightray/browser/win/notification_presenter_win7.cc
  60. 2 2
      brightray/browser/win/notification_presenter_win7.h
  61. 1 1
      brightray/browser/win/scoped_hstring.cc
  62. 3 3
      brightray/browser/win/win32_desktop_notifications/desktop_notification_controller.cc
  63. 2 2
      brightray/browser/win/win32_desktop_notifications/toast.cc
  64. 1 1
      brightray/browser/win/win32_desktop_notifications/toast.h
  65. 1 1
      brightray/browser/win/win32_notification.cc
  66. 2 2
      brightray/browser/win/win32_notification.h
  67. 5 5
      brightray/browser/win/windows_toast_notification.cc
  68. 1 1
      brightray/browser/win/windows_toast_notification.h
  69. 1 1
      brightray/browser/zoom_level_delegate.cc
  70. 2 2
      brightray/common/application_info_mac.mm
  71. 1 1
      brightray/common/application_info_win.cc
  72. 2 2
      brightray/common/content_client.cc
  73. 1 1
      brightray/common/mac/main_application_bundle.mm
  74. 3 3
      brightray/common/main_delegate.cc
  75. 2 2
      brightray/common/main_delegate_mac.mm
  76. 1 1
      brightray/common/switches.cc

+ 1 - 2
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',

+ 7 - 7
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 {

+ 1 - 1
brightray/browser/browser_client.h

@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-#include "browser/net_log.h"
+#include "brightray/browser/net_log.h"
 #include "content/public/browser/content_browser_client.h"
 
 namespace brightray {

+ 9 - 9
brightray/browser/browser_context.cc

@@ -2,19 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#include "browser/browser_context.h"
+#include "brightray/browser/browser_context.h"
 
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
-#include "browser/brightray_paths.h"
-#include "browser/browser_client.h"
-#include "browser/inspectable_web_contents_impl.h"
-#include "browser/media/media_device_id_salt.h"
-#include "browser/network_delegate.h"
-#include "browser/special_storage_policy.h"
-#include "browser/zoom_level_delegate.h"
-#include "common/application_info.h"
+#include "brightray/browser/brightray_paths.h"
+#include "brightray/browser/browser_client.h"
+#include "brightray/browser/inspectable_web_contents_impl.h"
+#include "brightray/browser/media/media_device_id_salt.h"
+#include "brightray/browser/network_delegate.h"
+#include "brightray/browser/special_storage_policy.h"
+#include "brightray/browser/zoom_level_delegate.h"
+#include "brightray/common/application_info.h"
 #include "components/prefs/json_pref_store.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"

+ 3 - 3
brightray/browser/browser_context.h

@@ -10,9 +10,9 @@
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
-#include "browser/net/devtools_network_controller_handle.h"
-#include "browser/permission_manager.h"
-#include "browser/url_request_context_getter.h"
+#include "brightray/browser/net/devtools_network_controller_handle.h"
+#include "brightray/browser/permission_manager.h"
+#include "brightray/browser/url_request_context_getter.h"
 #include "content/public/browser/browser_context.h"
 
 class PrefRegistrySimple;

+ 7 - 7
brightray/browser/browser_main_parts.cc

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#include "browser/browser_main_parts.h"
+#include "brightray/browser/browser_main_parts.h"
 
-#include "browser/browser_context.h"
-#include "browser/devtools_manager_delegate.h"
-#include "browser/web_ui_controller_factory.h"
-#include "common/main_delegate.h"
+#include "brightray/browser/browser_context.h"
+#include "brightray/browser/devtools_manager_delegate.h"
+#include "brightray/browser/web_ui_controller_factory.h"
+#include "brightray/common/main_delegate.h"
 
 #include "base/command_line.h"
 #include "base/feature_list.h"
@@ -28,7 +28,7 @@
 #endif
 
 #if defined(TOOLKIT_VIEWS)
-#include "browser/views/views_delegate.h"
+#include "brightray/browser/views/views_delegate.h"
 #endif
 
 #if defined(USE_X11)
@@ -36,7 +36,7 @@
 #include "base/nix/xdg_util.h"
 #include "base/path_service.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "browser/brightray_paths.h"
+#include "brightray/browser/brightray_paths.h"
 #include "chrome/browser/ui/libgtkui/gtk_ui.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/base/x/x11_util_internal.h"

+ 1 - 1
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"

+ 1 - 1
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 <algorithm>
 

+ 1 - 1
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"

+ 1 - 1
brightray/browser/devtools_file_system_indexer.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "browser/devtools_file_system_indexer.h"
+#include "brightray/browser/devtools_file_system_indexer.h"
 
 #include <stddef.h>
 

+ 3 - 3
brightray/browser/devtools_manager_delegate.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#include "browser/devtools_manager_delegate.h"
+#include "brightray/browser/devtools_manager_delegate.h"
 
 #include <vector>
 
@@ -12,8 +12,8 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
-#include "browser/net/devtools_network_protocol_handler.h"
-#include "common/content_client.h"
+#include "brightray/browser/net/devtools_network_protocol_handler.h"
+#include "brightray/common/content_client.h"
 #include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/devtools_frontend_host.h"
 #include "content/public/browser/devtools_socket_factory.h"

+ 1 - 1
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 <string>
 

+ 2 - 2
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 {
 

+ 7 - 7
brightray/browser/inspectable_web_contents_impl.cc

@@ -3,7 +3,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#include "browser/inspectable_web_contents_impl.h"
+#include "brightray/browser/inspectable_web_contents_impl.h"
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ -12,12 +12,12 @@
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
-#include "browser/browser_client.h"
-#include "browser/browser_context.h"
-#include "browser/browser_main_parts.h"
-#include "browser/inspectable_web_contents_delegate.h"
-#include "browser/inspectable_web_contents_view.h"
-#include "browser/inspectable_web_contents_view_delegate.h"
+#include "brightray/browser/browser_client.h"
+#include "brightray/browser/browser_context.h"
+#include "brightray/browser/browser_main_parts.h"
+#include "brightray/browser/inspectable_web_contents_delegate.h"
+#include "brightray/browser/inspectable_web_contents_view.h"
+#include "brightray/browser/inspectable_web_contents_view_delegate.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
 #include "components/prefs/scoped_user_pref_update.h"

+ 3 - 3
brightray/browser/inspectable_web_contents_impl.h

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

+ 1 - 1
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 {
 

+ 1 - 1
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"
 

+ 4 - 4
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 <AppKit/AppKit.h>
 
 #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 {
 

+ 1 - 1
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 <dlfcn.h>
 

+ 3 - 3
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 {

+ 2 - 2
brightray/browser/linux/libnotify_notification.h

@@ -7,8 +7,8 @@
 
 #include <string>
 
-#include "browser/linux/libnotify_loader.h"
-#include "browser/notification.h"
+#include "brightray/browser/linux/libnotify_loader.h"
+#include "brightray/browser/notification.h"
 #include "ui/base/glib/glib_signal.h"
 
 namespace brightray {

+ 2 - 2
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 {
 

+ 1 - 1
brightray/browser/linux/notification_presenter_linux.h

@@ -6,7 +6,7 @@
 #ifndef BRIGHTRAY_BROWSER_LINUX_NOTIFICATION_PRESENTER_LINUX_H_
 #define BRIGHTRAY_BROWSER_LINUX_NOTIFICATION_PRESENTER_LINUX_H_
 
-#include "browser/notification_presenter.h"
+#include "brightray/browser/notification_presenter.h"
 
 namespace brightray {
 

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

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

+ 5 - 5
brightray/browser/mac/bry_inspectable_web_contents_view.mm

@@ -1,9 +1,9 @@
-#include "browser/mac/bry_inspectable_web_contents_view.h"
+#include "brightray/browser/mac/bry_inspectable_web_contents_view.h"
 
-#include "browser/inspectable_web_contents_impl.h"
-#include "browser/inspectable_web_contents_view_delegate.h"
-#include "browser/inspectable_web_contents_view_mac.h"
-#include "browser/mac/event_dispatching_window.h"
+#include "brightray/browser/inspectable_web_contents_impl.h"
+#include "brightray/browser/inspectable_web_contents_view_delegate.h"
+#include "brightray/browser/inspectable_web_contents_view_mac.h"
+#include "brightray/browser/mac/event_dispatching_window.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "ui/gfx/mac/scoped_cocoa_disable_screen_updates.h"
 

+ 1 - 1
brightray/browser/mac/cocoa_notification.h

@@ -10,7 +10,7 @@
 #include <string>
 
 #include "base/mac/scoped_nsobject.h"
-#include "browser/notification.h"
+#include "brightray/browser/notification.h"
 
 namespace brightray {
 

+ 3 - 3
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 {

+ 1 - 1
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
 

+ 3 - 3
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
 

+ 2 - 2
brightray/browser/mac/notification_presenter_mac.h

@@ -7,8 +7,8 @@
 #define BRIGHTRAY_BROWSER_MAC_NOTIFICATION_PRESENTER_MAC_H_
 
 #include "base/mac/scoped_nsobject.h"
-#include "browser/mac/notification_center_delegate.h"
-#include "browser/notification_presenter.h"
+#include "brightray/browser/mac/notification_center_delegate.h"
+#include "brightray/browser/notification_presenter.h"
 
 namespace brightray {
 

+ 3 - 3
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 {
 

+ 1 - 1
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"

+ 1 - 1
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"

+ 2 - 2
brightray/browser/media/media_stream_devices_controller.cc

@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#include "browser/media/media_stream_devices_controller.h"
+#include "brightray/browser/media/media_stream_devices_controller.h"
 
-#include "browser/media/media_capture_devices_dispatcher.h"
+#include "brightray/browser/media/media_capture_devices_dispatcher.h"
 #include "content/public/browser/desktop_media_id.h"
 #include "content/public/common/media_stream_request.h"
 

+ 1 - 1
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 {
 

+ 4 - 4
brightray/browser/net/devtools_network_controller.cc

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#include "browser/net/devtools_network_controller.h"
+#include "brightray/browser/net/devtools_network_controller.h"
 
 #include "base/bind.h"
-#include "browser/net/devtools_network_conditions.h"
-#include "browser/net/devtools_network_interceptor.h"
-#include "browser/net/devtools_network_transaction.h"
+#include "brightray/browser/net/devtools_network_conditions.h"
+#include "brightray/browser/net/devtools_network_interceptor.h"
+#include "brightray/browser/net/devtools_network_transaction.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;

+ 3 - 3
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;

+ 2 - 2
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 <algorithm>
 #include <limits>
 
 #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 {

+ 4 - 4
brightray/browser/net/devtools_network_protocol_handler.cc

@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#include "browser/net/devtools_network_protocol_handler.h"
+#include "brightray/browser/net/devtools_network_protocol_handler.h"
 
 #include <string>
 
 #include "base/strings/stringprintf.h"
-#include "browser/browser_context.h"
-#include "browser/net/devtools_network_conditions.h"
-#include "browser/net/devtools_network_controller.h"
+#include "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"
 

+ 3 - 3
brightray/browser/net/devtools_network_transaction.cc

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#include "browser/net/devtools_network_transaction.h"
+#include "brightray/browser/net/devtools_network_transaction.h"
 
 #include <string>
 
-#include "browser/net/devtools_network_controller.h"
-#include "browser/net/devtools_network_upload_data_stream.h"
+#include "brightray/browser/net/devtools_network_controller.h"
+#include "brightray/browser/net/devtools_network_upload_data_stream.h"
 #include "net/base/load_timing_info.h"
 #include "net/base/net_errors.h"
 #include "net/base/upload_progress.h"

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

@@ -8,7 +8,7 @@
 #include <stdint.h>
 
 #include "base/memory/weak_ptr.h"
-#include "browser/net/devtools_network_interceptor.h"
+#include "brightray/browser/net/devtools_network_interceptor.h"
 #include "net/base/completion_callback.h"
 #include "net/base/load_states.h"
 #include "net/base/request_priority.h"

+ 3 - 3
brightray/browser/net/devtools_network_transaction_factory.cc

@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#include "browser/net/devtools_network_transaction_factory.h"
+#include "brightray/browser/net/devtools_network_transaction_factory.h"
 
 #include <set>
 #include <string>
 
-#include "browser/net/devtools_network_controller.h"
-#include "browser/net/devtools_network_transaction.h"
+#include "brightray/browser/net/devtools_network_controller.h"
+#include "brightray/browser/net/devtools_network_transaction.h"
 #include "content/public/browser/service_worker_context.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_network_layer.h"

+ 1 - 1
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"
 

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

@@ -9,7 +9,7 @@
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
-#include "browser/net/devtools_network_interceptor.h"
+#include "brightray/browser/net/devtools_network_interceptor.h"
 #include "net/base/upload_data_stream.h"
 
 namespace brightray {

+ 1 - 1
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"

+ 1 - 1
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 <string>
 #include <vector>

+ 3 - 3
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 {
 

+ 1 - 1
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 {
 

+ 1 - 1
brightray/browser/notification_delegate_adapter.h

@@ -8,7 +8,7 @@
 #include <memory>
 
 #include "base/macros.h"
-#include "browser/notification_delegate.h"
+#include "brightray/browser/notification_delegate.h"
 
 namespace brightray {
 

+ 2 - 2
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 {
 

+ 1 - 1
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"

+ 5 - 5
brightray/browser/platform_notification_service.cc

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#include "browser/platform_notification_service.h"
+#include "brightray/browser/platform_notification_service.h"
 
-#include "browser/browser_client.h"
-#include "browser/notification.h"
-#include "browser/notification_delegate_adapter.h"
-#include "browser/notification_presenter.h"
+#include "brightray/browser/browser_client.h"
+#include "brightray/browser/notification.h"
+#include "brightray/browser/notification_delegate_adapter.h"
+#include "brightray/browser/notification_presenter.h"
 #include "content/public/common/notification_resources.h"
 #include "content/public/common/platform_notification_data.h"
 #include "third_party/skia/include/core/SkBitmap.h"

+ 1 - 1
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 {
 

+ 6 - 6
brightray/browser/url_request_context_getter.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#include "browser/url_request_context_getter.h"
+#include "brightray/browser/url_request_context_getter.h"
 
 #include <algorithm>
 
@@ -12,11 +12,11 @@
 #include "base/strings/string_util.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/threading/worker_pool.h"
-#include "browser/net/devtools_network_controller_handle.h"
-#include "browser/net/devtools_network_transaction_factory.h"
-#include "browser/net_log.h"
-#include "browser/network_delegate.h"
-#include "common/switches.h"
+#include "brightray/browser/net/devtools_network_controller_handle.h"
+#include "brightray/browser/net/devtools_network_transaction_factory.h"
+#include "brightray/browser/net_log.h"
+#include "brightray/browser/network_delegate.h"
+#include "brightray/common/switches.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/cookie_store_factory.h"
 #include "content/public/common/content_switches.h"

+ 1 - 1
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"

+ 2 - 2
brightray/browser/web_ui_controller_factory.cc

@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#include "browser/web_ui_controller_factory.h"
+#include "brightray/browser/web_ui_controller_factory.h"
 
 #include "base/memory/singleton.h"
-#include "browser/devtools_ui.h"
+#include "brightray/browser/devtools_ui.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/common/url_constants.h"

+ 3 - 3
brightray/browser/win/notification_presenter_win.cc

@@ -4,7 +4,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#include "browser/win/notification_presenter_win.h"
+#include "brightray/browser/win/notification_presenter_win.h"
 
 #include <string>
 #include <vector>
@@ -13,8 +13,8 @@
 #include "base/md5.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/windows_version.h"
-#include "browser/win/notification_presenter_win7.h"
-#include "browser/win/windows_toast_notification.h"
+#include "brightray/browser/win/notification_presenter_win7.h"
+#include "brightray/browser/win/windows_toast_notification.h"
 #include "content/public/browser/desktop_notification_delegate.h"
 #include "content/public/common/platform_notification_data.h"
 #include "third_party/skia/include/core/SkBitmap.h"

+ 1 - 1
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;

+ 2 - 2
brightray/browser/win/notification_presenter_win7.cc

@@ -1,8 +1,8 @@
-#include "browser/win/notification_presenter_win7.h"
+#include "brightray/browser/win/notification_presenter_win7.h"
 
 #include <string>
 
-#include "browser/win/win32_notification.h"
+#include "brightray/browser/win/win32_notification.h"
 
 namespace brightray {
 

+ 2 - 2
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 {
 

+ 1 - 1
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 <winstring.h>
 

+ 3 - 3
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 <windowsx.h>
 #include <algorithm>
 #include <vector>
-#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;

+ 2 - 2
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 <uxtheme.h>
 #include <windowsx.h>
 #include <algorithm>
-#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")

+ 1 - 1
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 {
 

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

@@ -1,6 +1,6 @@
 #define WIN32_LEAN_AND_MEAN
 
-#include "browser/win/win32_notification.h"
+#include "brightray/browser/win/win32_notification.h"
 
 #include <windows.h>
 #include <string>

+ 2 - 2
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 {
 

+ 5 - 5
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 <shlobj.h>
 
 #include "base/strings/utf_string_conversions.h"
-#include "browser/notification_delegate.h"
-#include "browser/win/notification_presenter_win.h"
-#include "browser/win/scoped_hstring.h"
-#include "common/application_info.h"
+#include "brightray/browser/notification_delegate.h"
+#include "brightray/browser/win/notification_presenter_win.h"
+#include "brightray/browser/win/scoped_hstring.h"
+#include "brightray/common/application_info.h"
 #include "content/public/browser/browser_thread.h"
 
 using ABI::Windows::Data::Xml::Dom::IXmlAttribute;

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

@@ -14,7 +14,7 @@
 #include <wrl/implements.h>
 #include <string>
 
-#include "browser/notification.h"
+#include "brightray/browser/notification.h"
 
 using Microsoft::WRL::ClassicCom;
 using Microsoft::WRL::ComPtr;

+ 1 - 1
brightray/browser/zoom_level_delegate.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "browser/zoom_level_delegate.h"
+#include "brightray/browser/zoom_level_delegate.h"
 
 #include <functional>
 #include <vector>

+ 2 - 2
brightray/common/application_info_mac.mm

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

+ 1 - 1
brightray/common/application_info_win.cc

@@ -1,4 +1,4 @@
-#include "common/application_info.h"
+#include "brightray/common/application_info.h"
 
 #include <memory>
 

+ 2 - 2
brightray/common/content_client.cc

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#include "common/content_client.h"
+#include "brightray/common/content_client.h"
 
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
-#include "common/application_info.h"
+#include "brightray/common/application_info.h"
 #include "content/public/common/user_agent.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"

+ 1 - 1
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"

+ 3 - 3
brightray/common/main_delegate.cc

@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#include "common/main_delegate.h"
+#include "brightray/common/main_delegate.h"
 
 #include <memory>
 
 #include "base/command_line.h"
 #include "base/path_service.h"
-#include "browser/browser_client.h"
-#include "common/content_client.h"
+#include "brightray/browser/browser_client.h"
+#include "brightray/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_switches.h"

+ 2 - 2
brightray/common/main_delegate_mac.mm

@@ -12,8 +12,8 @@
 #include "base/path_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
-#include "common/application_info.h"
-#include "common/mac/main_application_bundle.h"
+#include "brightray/common/application_info.h"
+#include "brightray/common/mac/main_application_bundle.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/common/content_switches.h"
 #include "ui/base/resource/resource_bundle.h"

+ 1 - 1
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 {