Remove remaining +ash and !ash in chrome/ DEPS

Bug: 798569 Change-Id: I68aa4c7f08458324a6a59aa9cd2d8bfafeb95c99 Reviewed-on: https://chromium-review.googlesource.com/1111024 Commit-Queue: Steven Bennetts <stevenjb@chromium.org> Reviewed-by: Scott Violet <sky@chromium.org> Reviewed-by: James Cook <jamescook@chromium.org> Reviewed-by: Maksim Ivanov <emaxx@chromium.org> Reviewed-by: Jacob Dufault <jdufault@chromium.org> Cr-Commit-Position: refs/heads/master@{#570173}
Denger-Network · Jun 25, 2018 · 26121cb · 26121cb
1 parent 1f404f7
commit 26121cb
Show file tree

Hide file tree

Showing 46 changed files with 265 additions and 171 deletions.
diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS
@@ -90,6 +90,8 @@ include_rules = [
   # interfaces in //ash/public/interfaces. See //ash/README.md.
   "-ash",
   "+ash/public",
+  # Ash string IDs can be used in src/chrome.
+  "+ash/strings/grit/ash_strings.h",
   "+ash/components/quick_launch/public/mojom",
   "+ash/components/shortcut_viewer/public/mojom",
   "+ash/components/tap_visualizer/public/mojom",
@@ -220,7 +222,7 @@ specific_include_rules = {
     # Needed for classic mode.
     "+ash/ash_service.h",
   ],
-  # TODO(mash): see bugs 768439 and 768395.
+  # TODO(mash): Fix. https://crbug.com/768439, https://crbug.com/768395.
   "exo_parts\.cc": [
     "+ash/shell.h",
   ],
@@ -229,9 +231,6 @@ specific_include_rules = {
     "+ash/root_window_controller.h",
     "+ash/shell.h",
   ],
-  "display_info_provider_chromeos_unittest.cc": [
-    "+ui/events/devices/touch_device_transform.h"
-  ],
   # TODO(estade): the message center is initialized and shut down here, but it
   # should be the responsibility of code in chrome/browser/notifications/
   "browser_process_impl.cc": [

diff --git a/chrome/browser/chromeos/DEPS b/chrome/browser/chromeos/DEPS
@@ -1,8 +1,4 @@
 include_rules = [
-  "-ash",
-  # Public ash interfaces are OK.
-  "+ash/public",
-
   # TODO(ananta): Remove this when we move files which display UI in
   # chrome/browser/chromeos to chrome/browser/ui/views/chromeos
   # crbug.com/728877
@@ -36,12 +32,10 @@ include_rules = [
 specific_include_rules = {
   ".*test.*": [
    "!ash",
-   "+ash/public",
   ],
   "chrome_browser_main_chromeos\.cc": [
     # TODO(mash): Support EventRewriters, http://crbug.com/647781.
     "+ash/events/event_rewriter_controller.h",
-    "+ash/root_window_controller.h",
     "+ash/shell.h",
     "+ash/sticky_keys/sticky_keys_controller.h",
   ],

diff --git a/chrome/browser/chromeos/accessibility/DEPS b/chrome/browser/chromeos/accessibility/DEPS
@@ -1,12 +1,23 @@
-include_rules = [
-  # TODO(crbug.com/756054): Convert to using mojo interfaces in
-  # //ash/public/interfaces and eliminate this.
-  "!ash",
-  # Public interfaces are OK.
-  "+ash/public",
-]
-
 specific_include_rules = {
+  "accessibility_manager\.cc": [
+    # TODO(mash): Fix. https://crbug.com/594887
+    "+ash/accessibility/accessibility_controller.h",
+    "+ash/root_window_controller.h",
+    "+ash/shell.h",
+    # TODO(mash): Fix. https://crbug.com/647781
+    "+ash/sticky_keys/sticky_keys_controller.h",
+  ],
+  "magnification_manager\.cc": [
+    # TODO(mash): Fix. https://crbug.com/817157
+    "+ash/magnifier/magnification_controller.h",
+    "+ash/shell.h",
+  ],
+  "switch_access_event_handler\.cc": [
+    # TODO(mash): Fix. https://crbug.com/854025
+    "+ash/shell.h",
+  ],
+
+  # Testing
   ".*browsertest\.cc": [
     "+ash/root_window_controller.h",
     "+ash/system/status_area_widget.h",

diff --git a/chrome/browser/chromeos/arc/DEPS b/chrome/browser/chromeos/arc/DEPS
diff --git a/chrome/browser/chromeos/arc/accessibility/DEPS b/chrome/browser/chromeos/arc/accessibility/DEPS
@@ -0,0 +1,7 @@
+specific_include_rules = {
+  "arc_accessibility_helper_bridge.*": [
+    # TODO(mash): Fix. https://crbug.com/768439.
+    "+ash/system/message_center/arc/arc_notification_surface.h",
+    "+ash/system/message_center/arc/arc_notification_surface_manager.h",
+  ],
+}
diff --git a/chrome/browser/chromeos/arc/boot_phase_monitor/DEPS b/chrome/browser/chromeos/arc/boot_phase_monitor/DEPS
@@ -0,0 +1,7 @@
+specific_include_rules = {
+  "arc_instance_throttle\.cc": [
+    # TODO(mash): Fix. https://crbug.com/826386.
+    "+ash/shell.h",
+    "+ash/wm/window_util.h",
+  ],
+}
diff --git a/chrome/browser/chromeos/arc/screen_capture/DEPS b/chrome/browser/chromeos/arc/screen_capture/DEPS
@@ -0,0 +1,10 @@
+specific_include_rules = {
+  # TODO(mash): Fix these. https://crbug.com/557397
+  "arc_screen_capture_bridge\.cc": [
+    "+ash/shell.h",
+  ],
+  "arc_screen_capture_session\.cc": [
+    # To inform Shell that capture is active for cursor compositing.
+    "+ash/shell.h",
+  ],
+}
diff --git a/chrome/browser/chromeos/arc/voice_interaction/DEPS b/chrome/browser/chromeos/arc/voice_interaction/DEPS
@@ -0,0 +1,6 @@
+specific_include_rules = {
+  "arc_voice_interaction_framework_service\.cc": [
+    # TODO(mash): Fix. https://crbug.com/557397.
+    "+ash/shell.h",
+  ],
+}
diff --git a/chrome/browser/chromeos/display/DEPS b/chrome/browser/chromeos/display/DEPS
@@ -4,7 +4,8 @@ specific_include_rules = {
     "+ash/display/display_prefs.h",
     "+ash/shell.h",
   ],
-  # TODO(mash): http://crbug.com/839265.
+  # mash-ok, output_protection_controller_ash is not used in mash,
+  # output_protection_controller_mus is used instead.
   "output_protection_controller_ash\.cc": [
     "+ash/shell.h",
   ],

diff --git a/chrome/browser/chromeos/display/output_protection_controller_ash.cc b/chrome/browser/chromeos/display/output_protection_controller_ash.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/browser/chromeos/display/output_protection_controller_ash.h"
 
-#include "ash/shell.h"
+#include "ash/shell.h"  // mash-ok
 
 namespace chromeos {
 

diff --git a/chrome/browser/chromeos/input_method/DEPS b/chrome/browser/chromeos/input_method/DEPS
@@ -1,9 +1,4 @@
 include_rules = [
-  # TODO(crbug.com/678705): Convert to using mojo interfaces in
-  # //ash/public/interfaces and eliminate this.
-  "!ash",
-  # Public interfaces are OK.
-  "+ash/public",
   "-chrome",
   "+chrome/browser/chromeos/input_method",
   "+chrome/grit",
@@ -12,30 +7,44 @@ include_rules = [
 
 specific_include_rules = {
   # The configuration layer.
-  '(input_method_delegate_impl|input_method_persistence|browser_state_monitor)'
-  '\.(h|cc)': [
+  "(input_method_delegate_impl|input_method_persistence|browser_state_monitor)"
+  "\.(h|cc)": [
     "+chrome/common",
     "+chrome/browser",
     "+chrome/test",
     "+content/public",
   ],
-  # For testing.
-  '.*(_browsertest|_unittest|_test_helper|)\.(h|cc)': [
-    "+chrome/common",
-    "+chrome/browser",
-    "+chrome/test",
-    "+content/public",
+  # TODO(mash): Fix. https://crbug.com/738531
+  "candidate_window_controller_impl\.cc": [
+    "+ash/shell.h",
+    "+ash/wm/window_util.h",
+  ],
+  # TODO(mash): Fix these. https://crbug.com/756059
+  "input_method_engine\.cc": [
+    "+ash/shell.h",
   ],
+  "mode_indicator_controller\.cc": [
+    "+ash/shell.h",
+    "+ash/wm/window_util.h",
+  ],
+
   # TODO(erikwright): Bring this list to zero.
-  #
   # Do not add to the list of temporarily-allowed dependencies below,
   # and please do not introduce more #includes of these files.
-  'input_method_manager_impl\.cc': [
+  "input_method_manager_impl\.cc": [
     # TODO(erikwright): Much/all of language_preferences can/should be decoupled
     # from chrome/browser.
     "!chrome/browser/chromeos/language_preferences.h"
   ],
-  'xkeyboard_unittest\.cc': [
+
+  # For testing.
+  ".*(_browsertest|_unittest|_test_helper|)\.(h|cc)": [
+    "+chrome/common",
+    "+chrome/browser",
+    "+chrome/test",
+    "+content/public",
+  ],
+  "xkeyboard_unittest\.cc": [
     "!content/public/test/test_browser_thread.h",
   ],
 }
diff --git a/chrome/browser/chromeos/login/DEPS b/chrome/browser/chromeos/login/DEPS
@@ -1,10 +1,4 @@
 include_rules = [
-  # TODO(crbug.com/678705): Convert to using mojo interfaces in
-  # //ash/public/interfaces and eliminate this.
-  "!ash",
-  # Public interfaces are OK.
-  "+ash/public",
-
   "+components/captive_portal",
   "+components/login",
   "+components/toolbar",
@@ -18,6 +12,10 @@ include_rules = [
 ]
 
 specific_include_rules = {
+  # TODO(mash): Fix. https://crbug.com/648733
+  "app_launch_controller\.cc": [
+    "+ash/shell.h",
+  ],
   "login_browsertest\.cc": [
     "+ash/system/status_area_widget.h",
     "+ash/system/unified/unified_system_tray.h",

diff --git a/chrome/browser/chromeos/login/lock/DEPS b/chrome/browser/chromeos/login/lock/DEPS
@@ -0,0 +1,6 @@
+specific_include_rules = {
+  # TODO(jdufault): This code is deprecated and will be removed.
+  "webui_screen_locker\.h": [
+    "+ash/login/ui/lock_window.h",
+  ],
+}
diff --git a/chrome/browser/chromeos/login/ui/DEPS b/chrome/browser/chromeos/login/ui/DEPS
@@ -6,3 +6,29 @@ include_rules = [
   # DO NOT ADD ANY MORE ITEMS TO THE ABOVE LIST!
 ]
 
+specific_include_rules = {
+  # TODO(mash): Fix. https://crbug.com/854323
+  "input_events_blocker\.cc": [
+    "+ash/shell.h",
+  ],
+  # TODO(mash): Fix. https://crbug.com/854328
+  "login_display_host_common\.cc": [
+    "+ash/shell.h",
+  ],
+  # TODO(mash): Fix. https://crbug.com/854346
+  "webui_login_view.*": [
+     "+ash/accelerators/accelerator_controller.h",
+     "+ash/focus_cycler.h",
+     "+ash/public/cpp/ash_features.h",
+     "+ash/root_window_controller.h",
+     "+ash/shelf/shelf_widget.h",
+     "+ash/shell.h",
+     "+ash/system",
+  ],
+  # TODO(jdufault): Deprecate. https://crbug.com/792654
+  "login_display_host_webui\.cc": [
+    "+ash/accessibility/focus_ring_controller.h",
+    "+ash/shell.h",
+    "+ash/system/tray/system_tray.h",
+  ],
+}
diff --git a/chrome/browser/chromeos/policy/DEPS b/chrome/browser/chromeos/policy/DEPS
@@ -1,9 +1,4 @@
 include_rules = [
-  # TODO(crbug.com/678705): Convert to using mojo interfaces in
-  # //ash/public/interfaces and eliminate this.
-  "!ash",
-  # Public interfaces are OK.
-  "+ash/public",
   "+components/feedback",
   "+components/invalidation",
   "+components/user_manager",

diff --git a/chrome/browser/chromeos/system_logs/DEPS b/chrome/browser/chromeos/system_logs/DEPS
@@ -1,5 +1,5 @@
 specific_include_rules = {
-  # TODO(mash): http://crbug.com/581462.
+  # TODO(mash): http://crbug.com/807408.
   "touch_log_source\.cc": [
     "+ash/touch/touch_hud_debug.h",
   ],

diff --git a/chrome/browser/devtools/protocol/DEPS b/chrome/browser/devtools/protocol/DEPS
@@ -1,4 +1,7 @@
-include_rules = [
-  "+ash/shell.h",
-  "+ash/wm/overview/window_selector_controller.h",
-]
+specific_include_rules = {
+  # TODO(mash): Fix. https://crbug.com/758061
+  "window_manager_handler\.cc": [
+    "+ash/shell.h",
+    "+ash/wm/overview/window_selector_controller.h",
+  ]
+}
diff --git a/chrome/browser/extensions/DEPS b/chrome/browser/extensions/DEPS
@@ -1,6 +1,4 @@
 include_rules = [
-  # Only public interfaces allowed. See //ash/README.md
-  "+ash/public/cpp",
   "+components/chrome_apps",
   "+components/crx_file",
   "+components/strings/grit/components_strings.h",
@@ -17,18 +15,6 @@ include_rules = [
   "+ppapi/shared_impl",
 ]
 specific_include_rules = {
-  "bookmark_app_helper\.cc": [
-    # TODO(mash): Remove. http://crbug.com/678705
-    "+ash/shell.h",
-  ],
-  "display_info_provider_chromeos(|_unittest)\.cc": [
-    # TODO(mash): Remove. http://crbug.com/678705
-    "+ash/display",
-    "+ash/shell.h",
-    "+ash/test",
-    "+ash/touch",
-    "+ash/wm/tablet_mode/tablet_mode_controller.h",
-  ],
   "extension_protocols_unittest\.cc": [
     "+services/network/test",
   ],

diff --git a/chrome/browser/extensions/api/automation/DEPS b/chrome/browser/extensions/api/automation/DEPS
@@ -1,5 +1,6 @@
-include_rules = [
-  # TODO(mash): Remove. http://crbug.com/678705
-  "+ash/accelerators/accelerator_controller.h",
-  "+ash/shell.h",
-]
+specific_include_rules = {
+  "automation_apitest\.cc": [
+    "+ash/accelerators/accelerator_controller.h",
+    "+ash/shell.h",
+  ]
+}
diff --git a/chrome/browser/extensions/api/virtual_keyboard_private/DEPS b/chrome/browser/extensions/api/virtual_keyboard_private/DEPS
@@ -1,6 +1,11 @@
 include_rules = [
-  # TODO(mash): Remove. http://crbug.com/678705
-  "+ash/shell.h",
   "+media/audio"
   "+services/audio/public/cpp"
 ]
+
+specific_include_rules = {
+  # TODO(mash): Fix. https://crbug.com/646565
+  "chrome_virtual_keyboard_delegate\.cc": [
+    "+ash/shell.h",
+  ]
+}
diff --git a/chrome/browser/extensions/system_display/DEPS b/chrome/browser/extensions/system_display/DEPS
@@ -0,0 +1,9 @@
+specific_include_rules = {
+  # TODO(mash): Remove. http://crbug.com/678705
+  "display_info_provider_chromeos_unittest\.cc": [
+    "+ash/display",
+    "+ash/shell.h",
+    "+ash/test",
+    "+ash/wm/tablet_mode/tablet_mode_controller.h",
+  ],
+}
diff --git a/chrome/browser/media/webrtc/DEPS b/chrome/browser/media/webrtc/DEPS
@@ -1,12 +1,22 @@
 include_rules = [
-  # TODO(mash): Remove. http://crbug.com/723880
-  "+ash/shell.h",
   "+services/audio/public/cpp",
   "+third_party/libyuv",
   "+third_party/webrtc",
 ]
+
 specific_include_rules = {
-  # TODO(mash): Remove. http://crbug.com/723880
+  # TODO(mash): Fix these. https://crbug.com/723880
+  "desktop_capture_access_handler\.cc": [
+    "+ash/shell.h",
+  ],
+  "desktop_media_list_ash\.cc": [
+    "+ash/shell.h",
+  ],
+  # TODO(mash): Fix. https://crbug.com/855147
+  "media_capture_devices_dispatcher\.cc": [
+    "+ash/shell.h",
+  ],
+  # TODO(mash): Remove. https://crbug.com/723880
   ".*_unittest\.cc": [
     "+ash/test/ash_test_base.h",
   ]