grit: qualify includes for shell_resources.h, virtual_driver_setup_resources.h, bluetooth_strings.h, app_shell_resources.h

BUG=401588
TBR=fake virtual printer dep

Review-Url: https://codereview.chromium.org/2714393004
Cr-Commit-Position: refs/heads/master@{#453586}

chromecast/app/BUILD.gn

@@ -92,6 +92,7 @@ source_set("unittests") {
 
 grit("resources") {
   source = "//chromecast/app/resources/shell_resources.grd"
+  use_qualified_include = true
 
   resource_ids = "//chromecast/app/resources/resource_ids"
 
@@ -104,6 +105,8 @@ grit("resources") {
 grit("chromecast_settings") {
   source = "//chromecast/app/resources/chromecast_settings.grd"
   resource_ids = "//chromecast/app/resources/resource_ids"
+
+  # TODO(thakis): Consider removing this in favor of the default directory.
   output_dir = "$root_gen_dir/chromecast_strings"
 
   outputs = [

chromecast/browser/DEPS

@@ -2,6 +2,7 @@ include_rules = [
   "+cc/base/switches.h",
   "+chromecast/common",
   "+chromecast/graphics",
+  "+chromecast/app/resources/grit/shell_resources.h",
   "+chromecast/media",
   "+chromecast/net",
   "+chromecast/service",
@@ -17,7 +18,6 @@ include_rules = [
   "+gin/v8_initializer.h",
   "+gpu/command_buffer/service/gpu_switches.h",
   "+grit/chromecast_settings.h",
-  "+grit/shell_resources.h",
   "+media/audio",
   "+media/base",
   "+media/mojo",

chromecast/browser/devtools/cast_devtools_manager_delegate.cc

@@ -6,8 +6,8 @@
 
 #include "base/macros.h"
 #include "build/build_config.h"
+#include "chromecast/app/grit/shell_resources.h"
 #include "content/public/browser/devtools_agent_host.h"
-#include "grit/shell_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace chromecast {

cloud_print/DEPS

@@ -1,5 +1,5 @@
 include_rules = [
   "+chrome/common",
   "+chrome/installer/launcher_support",
-  "+grit",
+  "+virtual_driver_setup_resources",
 ]

cloud_print/virtual_driver/win/install/BUILD.gn

@@ -59,7 +59,9 @@ grit("resources") {
   visibility = [ ":*" ]
 
   source = "virtual_driver_setup_resources.grd"
+  use_qualified_include = true
 
+  # TODO(thakis): Consider removing this in favor of the default directory.
   output_dir = "$root_gen_dir/virtual_driver_setup_resources"
 
   outputs = [

cloud_print/virtual_driver/win/install/setup.cc

@@ -23,7 +23,7 @@
 #include "cloud_print/common/win/install_utils.h"
 #include "cloud_print/virtual_driver/win/virtual_driver_consts.h"
 #include "cloud_print/virtual_driver/win/virtual_driver_helpers.h"
-#include "grit/virtual_driver_setup_resources.h"
+#include "virtual_driver_setup_resources/grit/virtual_driver_setup_resources.h"
 
 #include <strsafe.h>  // Must be after base headers to avoid deprecation
                       // warnings.

device/bluetooth/DEPS

@@ -2,7 +2,6 @@ include_rules = [
   "+chromeos/dbus",
   "+crypto",
   "+dbus",
-  "+grit",
   "+jni",
   "+net/base",
   "+net/log",

device/bluetooth/bluetooth_device.cc

@@ -19,7 +19,7 @@
 #include "device/bluetooth/bluetooth_remote_gatt_descriptor.h"
 #include "device/bluetooth/bluetooth_remote_gatt_service.h"
 #include "device/bluetooth/string_util_icu.h"
-#include "grit/bluetooth_strings.h"
+#include "device/bluetooth/strings/grit/bluetooth_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace device {

device/bluetooth/strings/BUILD.gn

@@ -6,6 +6,7 @@ import("//tools/grit/grit_rule.gni")
 
 grit("strings") {
   source = "../bluetooth_strings.grd"
+  use_qualified_include = true
   outputs = [
     "grit/bluetooth_strings.h",
     "bluetooth_strings_am.pak",

extensions/shell/BUILD.gn

@@ -13,6 +13,7 @@ assert(enable_extensions)
 
 grit("resources") {
   source = "app_shell_resources.grd"
+  use_qualified_include = true
   outputs = [
     "grit/app_shell_resources.h",
     "app_shell_resources.pak",

extensions/shell/DEPS

@@ -16,10 +16,5 @@ include_rules = [
   # the embedder before being used by the extension.
   "+components/storage_monitor",
 
-  # Only allow app_shell and extensions resources, not general Chrome ones.
-  "-grit",
-  "+grit/app_shell_resources.h",
-  "+grit/extensions_resources.h",
-
   # Real DEPS go in subdirectories, for example extensions/shell/browser/DEPS.
 ]

extensions/shell/common/DEPS

@@ -1,5 +1,6 @@
 include_rules = [
   "+components/nacl/common",
   "+components/nacl/renderer/plugin",
+  "+extensions/shell/grit",
   "+ppapi",
 ]

extensions/shell/common/shell_extensions_client.cc

@@ -27,7 +27,7 @@
 #include "extensions/shell/common/api/shell_behavior_features.h"
 #include "extensions/shell/common/api/shell_manifest_features.h"
 #include "extensions/shell/common/api/shell_permission_features.h"
-#include "grit/app_shell_resources.h"
+#include "extensions/shell/grit/app_shell_resources.h"
 
 namespace extensions {