Narrow and document ash/ DEPS in c/b/ui/ash

Bug: 798569
Change-Id: I476672a73ba64ee28d399686d0ecfc4c26690936
Reviewed-on: https://chromium-review.googlesource.com/1060579Reviewed-by: James Cook <jamescook@chromium.org>
Commit-Queue: Steven Bennetts <stevenjb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#559174}

chrome/browser/ui/ash/DEPS

 include_rules = [
   # Code under //ash runs out-of-process in mash so it must be accessed via mojo
   # interfaces in //ash/public/interfaces. See //ash/README.md.
-  # TODO(mash): Remove. http://crbug.com/678705
-  "!ash",
-
   "+ash/public",
 
   # Use //ui/wm/core/window_util.h when manipulating chrome browser windows.
@@ -22,8 +19,63 @@ include_rules = [
 ]
 
 specific_include_rules = {
+  ".*test.*": [
+   "!ash",
+  ],
   # AshShellInit supports CLASSIC and MUS modes so allow ash/ includes.
   "ash_shell_init\.cc": [
     "+ash",
   ],
+  # https://crbug.com/843315
+  "ash_util\.cc": [
+    "+ash/accelerators/accelerator_controller.h",
+    "+ash/shell.h",
+  ],
+  # https://crbug.com/826370
+  "auto_connect_notifier\.cc": [
+    "+ash/system/network/network_icon.h",
+  ],
+  # For ash::Shell::SetIsBrowserProcessWithMash()
+  "chrome_browser_main_extra_parts_ash\.cc": [
+    "+ash/shell.h",
+  ],
+  # https://crbug.com/843332
+  "chrome_keyboard_ui\.cc": [
+    "+ash/root_window_controller.h",
+    "+ash/shell.h",
+  ],
+  # https://crbug.com/557406
+  "chrome_launcher_controller\.cc": [
+    "+ash/shell.h",
+    "+ash/strings/grit/ash_strings.h",
+  ],
+  # https://crbug.com/124222
+  "chrome_new_window_client\.cc": [
+    "+ash/content/keyboard_overlay/keyboard_overlay_view.h",
+  ],
+  # https://crbug.com/706246
+  "chrome_screenshot_grabber.*": [
+    "+ash/screenshot_delegate.h",
+    "+ash/shell.h",
+  ],
+  # https://crbug.com/672277
+  "chrome_shell_content_state\.h": [
+    "+ash/content/shell_content_state.h",
+  ],
+  # https://crbug.com/665064
+  "chrome_shell_delegate.*": [
+    "+ash",
+  ],
+  # https://crbug.com/672277
+  "session_util\.cc": [
+    "+ash/content/shell_content_state.h",
+  ],
+  # For ash::Shell::GetContainer (!mash)
+  "system_tray_client\.cc": [
+    "+ash/shell.h",
+  ],
+  # https://crbug.com/796366
+  "tab_scrubber\.cc": [
+    "+ash/shell.h",
+  ],
 }

chrome/browser/ui/ash/ksv/DEPS

 include_rules = [
-  # Restrict access to //ash and //chrome in order to make it easy to migrate
-  # the KSV launching code and unittest in the future if we want KSV to be a
-  # completely independent mojo app under mustash.
-  "-ash",
+  # Restrict access to //chrome in order to make it easy to migrate the KSV
+  # launching code and unittest in the future if we want KSV to be a completely
+  # independent mojo app under mustash.
   "-chrome",
-  "+ash/components/shortcut_viewer",
-  "+ash/public",
-  "+ash/shell.h",
   "+chrome/browser/ui/ash/ksv",
 ]
 
 specific_include_rules = {
   "keyboard_shortcut_viewer_metadata_unittest\.cc": [
+    "+ash/components/shortcut_viewer",
     "+chrome/browser/ui/views",
   ],
+  # https://crbug.com/833673
+  "keyboard_shortcut_viewer_util\.cc": [
+    "+ash/components/shortcut_viewer/views/keyboard_shortcut_view.h",
+    "+ash/shell.h",
+  ],
 }

chrome/browser/ui/ash/launcher/DEPS

+specific_include_rules = {
+  # https://crbug.com/768908
+  "extension_launcher_context_menu\.cc": [
+    "+ash/scoped_root_window_for_new_windows.h",
+    "+ash/shell.h",
+  ],
+  # https://crbug.com/557406
+  "browser_status_monitor\.cc": [
+    "+ash/shell.h",
+  ],
+  # https://crbug.com/826386
+  "app_window_launcher_controller\.cc": [
+    "+ash/shell.h",
+  ],
+}

chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc

@@ -5,11 +5,9 @@
 
 #include <string>
 
-#include "ash/display/screen_orientation_controller.h"
 #include "ash/public/cpp/app_types.h"
 #include "ash/public/cpp/shelf_model.h"
 #include "ash/public/cpp/window_properties.h"
-#include "ash/shell.h"
 #include "base/bind.h"
 #include "chrome/browser/chromeos/arc/arc_optin_uma.h"
 #include "chrome/browser/chromeos/arc/arc_util.h"

chrome/browser/ui/ash/multi_user/DEPS

+specific_include_rules = {
+  # For Shell::tablet_mode_controller() (!mash)
+  "multi_user_window_manager_chromeos\.cc": [
+    "+ash/shell.h",
+    "+ash/wm/tablet_mode/tablet_mode_controller.h",
+  ],
+  # https://crbug.com/756085
+  "user_switch_animator_chromeos\.cc": [
+    "+ash/app_list/app_list_controller_impl.h",
+    "+ash/shell.h",
+    "+ash/wm/mru_window_tracker.h",
+    "+ash/wm/window_positioner.h",
+  ],
+}

chrome/browser/ui/ash/network/DEPS

 include_rules = [
   "+components/captive_portal",
 ]
+
+specific_include_rules = {
+  # https://crbug.com/826370
+  "tether_notification_presenter\.h": [
+    "+ash/system/network/network_icon.h",
+  ],
+  # https://crbug.com/651157
+  "networking_config_delegate_chromeos\.h": [
+    "+ash/system/networking_config_delegate.h",
+  ],
+}