Use qualified path for three more grit headers from ui.

They are: - app_locale_settings.h - ui_unscaled_resources.h - webui_resources.h BUG=401588 TEST=None R=thestig@chromium.org,thakis@chromium.org TBR=darin@chromium.org Review URL: https://codereview.chromium.org/530623002 Cr-Commit-Position: refs/heads/master@{#293655}
cbchan · Sep 7, 2014 · 272c8d7 · 272c8d7
1 parent d564db4
commit 272c8d7
Show file tree

Hide file tree

Showing 17 changed files with 20 additions and 20 deletions.
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
@@ -121,7 +121,6 @@
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
-#include "grit/app_locale_settings.h"
 #include "grit/platform_locale_settings.h"
 #include "net/base/net_module.h"
 #include "net/base/sdch_manager.h"
@@ -132,6 +131,7 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/strings/grit/app_locale_settings.h"
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/metrics/thread_watcher_android.h"

diff --git a/chrome/browser/chrome_browser_main_win.cc b/chrome/browser/chrome_browser_main_win.cc
@@ -48,7 +48,6 @@
 #include "chrome/installer/util/shell_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/main_function_params.h"
-#include "grit/app_locale_settings.h"
 #include "installer_util_strings/installer_util_strings.h"
 #include "ui/base/cursor/cursor_loader_win.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -57,6 +56,7 @@
 #include "ui/base/win/message_box_win.h"
 #include "ui/gfx/platform_font_win.h"
 #include "ui/gfx/switches.h"
+#include "ui/strings/grit/app_locale_settings.h"
 
 namespace {
 

diff --git a/chrome/test/data/webui/webui_resource_browsertest.cc b/chrome/test/data/webui/webui_resource_browsertest.cc
@@ -11,7 +11,7 @@
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
-#include "grit/webui_resources.h"
+#include "ui/resources/grit/webui_resources.h"
 
 class WebUIResourceBrowserTest : public InProcessBrowserTest {
  public:

diff --git a/content/DEPS b/content/DEPS
@@ -29,8 +29,6 @@ include_rules = [
   "+crypto",
   "+grit/blink_resources.h",
   "+grit/content_strings.h",
-  "+grit/webui_resources.h",
-  "+grit/webui_resources_map.h",
 
   "+dbus",
   "+gpu",
@@ -90,9 +88,11 @@ include_rules = [
   "+ui/ozone/gpu",
   "+ui/ozone/public",
   "+ui/resources/grit/ui_resources.h",
-  "+ui/strings/grit/ui_strings.h",
+  "+ui/resources/grit/webui_resources.h",
+  "+ui/resources/grit/webui_resources_map.h",
   "+ui/shell_dialogs",
   "+ui/snapshot",
+  "+ui/strings/grit/ui_strings.h",
   "+ui/surface",
   "+ui/wm",
   # Content knows about grd files, but the specifics of how to get a resource

diff --git a/content/browser/webui/shared_resources_data_source.cc b/content/browser/webui/shared_resources_data_source.cc
@@ -10,8 +10,8 @@
 #include "base/threading/thread_restrictions.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/url_constants.h"
-#include "grit/webui_resources_map.h"
 #include "net/base/mime_util.h"
+#include "ui/resources/grit/webui_resources_map.h"
 
 namespace {
 

diff --git a/content/common/cursors/DEPS b/content/common/cursors/DEPS
@@ -1,4 +1,3 @@
 include_rules = [
-  "+grit/ui_unscaled_resources.h",
   "+third_party/WebKit/public/platform",
 ]
diff --git a/content/public/test/browser_test_utils.cc b/content/public/test/browser_test_utils.cc
@@ -29,7 +29,6 @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/test/test_utils.h"
-#include "grit/webui_resources.h"
 #include "net/base/filename_util.h"
 #include "net/cookies/cookie_store.h"
 #include "net/test/python_utils.h"
@@ -40,6 +39,7 @@
 #include "ui/compositor/test/draw_waiter_for_test.h"
 #include "ui/events/gestures/gesture_configuration.h"
 #include "ui/events/keycodes/dom4/keycode_converter.h"
+#include "ui/resources/grit/webui_resources.h"
 
 #if defined(USE_AURA)
 #include "ui/aura/test/window_event_dispatcher_test_api.h"

diff --git a/content/test/webui_resource_browsertest.cc b/content/test/webui_resource_browsertest.cc
@@ -12,8 +12,8 @@
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/shell/browser/shell.h"
-#include "grit/webui_resources.h"
 #include "net/base/filename_util.h"
+#include "ui/resources/grit/webui_resources.h"
 
 namespace content {
 

diff --git a/ui/base/DEPS b/ui/base/DEPS
@@ -1,15 +1,15 @@
 include_rules = [
   "+cc",
   "-cc/blink",
-  "+grit/app_locale_settings.h",
-  "+grit/ui_unscaled_resources.h",
-  "+grit/webui_resources.h",
   "+jni",
   "+net",
   "+skia/ext",
   "+third_party/skia",
   "+ui/events",
   "+ui/gfx",
   "+ui/resources/grit/ui_resources.h",
+  "+ui/resources/grit/ui_unscaled_resources.h",
+  "+ui/resources/grit/webui_resources.h",
+  "+ui/strings/grit/app_locale_settings.h",
   "+ui/strings/grit/ui_strings.h",
 ]
diff --git a/ui/base/cursor/cursor_loader_win.cc b/ui/base/cursor/cursor_loader_win.cc
@@ -6,8 +6,8 @@
 
 #include "base/lazy_instance.h"
 #include "base/strings/string16.h"
-#include "grit/ui_unscaled_resources.h"
 #include "ui/base/cursor/cursor.h"
+#include "ui/resources/grit/ui_unscaled_resources.h"
 
 namespace ui {
 

diff --git a/ui/base/l10n/l10n_util_win.cc b/ui/base/l10n/l10n_util_win.cc
@@ -15,10 +15,10 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/i18n.h"
 #include "base/win/windows_version.h"
-#include "grit/app_locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/win/dpi.h"
+#include "ui/strings/grit/app_locale_settings.h"
 
 namespace {
 

diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc
@@ -20,7 +20,6 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/lock.h"
 #include "build/build_config.h"
-#include "grit/app_locale_settings.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -35,6 +34,7 @@
 #include "ui/gfx/safe_integer_conversions.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/size_conversions.h"
+#include "ui/strings/grit/app_locale_settings.h"
 
 #if defined(OS_ANDROID)
 #include "ui/base/resource/resource_bundle_android.h"

diff --git a/ui/base/webui/jstemplate_builder.cc b/ui/base/webui/jstemplate_builder.cc
@@ -11,9 +11,9 @@
 #include "base/json/json_string_value_serializer.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
-#include "grit/webui_resources.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/resources/grit/webui_resources.h"
 
 namespace {
 

diff --git a/ui/base/webui/web_ui_util.cc b/ui/base/webui/web_ui_util.cc
@@ -12,14 +12,14 @@
 #include "base/logging.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/strings/string_number_conversions.h"
-#include "grit/app_locale_settings.h"
 #include "net/base/escape.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/window_open_disposition.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/image_skia.h"
+#include "ui/strings/grit/app_locale_settings.h"
 #include "url/gurl.h"
 
 #if defined(OS_WIN)

diff --git a/ui/resources/BUILD.gn b/ui/resources/BUILD.gn
@@ -27,6 +27,7 @@ grit("ui_resources_grd") {
 
 grit("ui_unscaled_resources_grd") {
   source = "ui_unscaled_resources.grd"
+  use_qualified_include = true
   outputs = [
     "grit/ui_unscaled_resources.h",
     "ui_unscaled_resources.rc",
@@ -91,4 +92,3 @@ repack("repack_ui_test_pak") {
     deps += [ ":copy_ui_resources_100_percent" ]
   }
 }
-
diff --git a/ui/strings/BUILD.gn b/ui/strings/BUILD.gn
@@ -15,6 +15,7 @@ group("strings") {
 
 grit("ui_strings") {
   source = "ui_strings.grd"
+  use_qualified_include = true
   outputs = [
     "grit/ui_strings.h",
     "ui_strings_am.pak",
@@ -76,6 +77,7 @@ grit("ui_strings") {
 
 grit("app_locale_settings") {
   source = "app_locale_settings.grd"
+  use_qualified_include = true
   outputs = [
     "grit/app_locale_settings.h",
     "app_locale_settings_am.pak",

diff --git a/ui/strings/ui_strings.gyp b/ui/strings/ui_strings.gyp
@@ -26,7 +26,6 @@
           'includes': [ '../../build/grit_action.gypi' ],
         },
       ],
-      'includes': [ '../../build/grit_target.gypi' ],
     },
   ],
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,7 +26,6 @@ @@
               'includes': [ '../../build/grit_action.gypi' ],
             },
           ],
-          'includes': [ '../../build/grit_target.gypi' ],
         },
       ],
     }