diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-17 07:05:57 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-17 07:07:17 +0000 |
| commit | b47dc49eb5efb6eb0bf5dbac3abb6f54f8ac1792 (patch) | |
| tree | 092842afbbeed866b39ba0e460c8879cc453b890 /ash | |
| parent | 253a70e8a9744272d7717daacb00a30c590ec849 (diff) | |
| download | chromium_src-b47dc49eb5efb6eb0bf5dbac3abb6f54f8ac1792.zip chromium_src-b47dc49eb5efb6eb0bf5dbac3abb6f54f8ac1792.tar.gz chromium_src-b47dc49eb5efb6eb0bf5dbac3abb6f54f8ac1792.tar.bz2 | |
Use a qualified path for ui_resources.h grit includes.
BUG=401588
TEST=None
R=thestig@chromium.org,thakis@chromium.org
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/480693002
Cr-Commit-Position: refs/heads/master@{#290178}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290178 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/DEPS | 1 | ||||
| -rw-r--r-- | ash/drag_drop/drag_image_view.cc | 2 | ||||
| -rw-r--r-- | ash/system/tray/hover_highlight_view.cc | 2 | ||||
| -rw-r--r-- | ash/system/tray/tray_bar_button_with_title.cc | 2 | ||||
| -rw-r--r-- | ash/system/tray/tray_notification_view.cc | 2 | ||||
| -rw-r--r-- | ash/system/user/accounts_detailed_view.cc | 2 | ||||
| -rw-r--r-- | ash/wm/ash_native_cursor_manager_unittest.cc | 2 |
7 files changed, 6 insertions, 7 deletions
@@ -6,7 +6,6 @@ include_rules = [ "+gpu/config", "+grit/ash_resources.h", "+grit/ash_strings.h", - "+grit/ui_resources.h", "+grit/ui_strings.h", "+media", "+skia/ext", diff --git a/ash/drag_drop/drag_image_view.cc b/ash/drag_drop/drag_image_view.cc index 746d619..2148209 100644 --- a/ash/drag_drop/drag_image_view.cc +++ b/ash/drag_drop/drag_image_view.cc @@ -4,13 +4,13 @@ #include "ash/drag_drop/drag_image_view.h" -#include "grit/ui_resources.h" #include "skia/ext/image_operations.h" #include "ui/aura/window.h" #include "ui/base/resource/resource_bundle.h" #include "ui/compositor/dip_util.h" #include "ui/gfx/canvas.h" #include "ui/gfx/size_conversions.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/widget/widget.h" #include "ui/wm/core/shadow_types.h" diff --git a/ash/system/tray/hover_highlight_view.cc b/ash/system/tray/hover_highlight_view.cc index e87708c..be2efc2 100644 --- a/ash/system/tray/hover_highlight_view.cc +++ b/ash/system/tray/hover_highlight_view.cc @@ -7,11 +7,11 @@ #include "ash/system/tray/fixed_sized_image_view.h" #include "ash/system/tray/tray_constants.h" #include "ash/system/tray/view_click_listener.h" -#include "grit/ui_resources.h" #include "ui/accessibility/ax_view_state.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" #include "ui/gfx/font_list.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/border.h" #include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" diff --git a/ash/system/tray/tray_bar_button_with_title.cc b/ash/system/tray/tray_bar_button_with_title.cc index a020135..e8b8f53 100644 --- a/ash/system/tray/tray_bar_button_with_title.cc +++ b/ash/system/tray/tray_bar_button_with_title.cc @@ -6,9 +6,9 @@ #include "ash/system/tray/tray_constants.h" #include "base/memory/scoped_ptr.h" -#include "grit/ui_resources.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image_skia.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/controls/label.h" #include "ui/views/painter.h" diff --git a/ash/system/tray/tray_notification_view.cc b/ash/system/tray/tray_notification_view.cc index a728c60..bf977f5 100644 --- a/ash/system/tray/tray_notification_view.cc +++ b/ash/system/tray/tray_notification_view.cc @@ -7,9 +7,9 @@ #include "ash/system/tray/system_tray_item.h" #include "ash/system/tray/tray_constants.h" #include "grit/ash_strings.h" -#include "grit/ui_resources.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image_skia.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/background.h" #include "ui/views/controls/button/image_button.h" #include "ui/views/controls/image_view.h" diff --git a/ash/system/user/accounts_detailed_view.cc b/ash/system/user/accounts_detailed_view.cc index d253414..8e64a6a 100644 --- a/ash/system/user/accounts_detailed_view.cc +++ b/ash/system/user/accounts_detailed_view.cc @@ -19,9 +19,9 @@ #include "base/strings/utf_string_conversions.h" #include "components/user_manager/user_info.h" #include "grit/ash_resources.h" -#include "grit/ui_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/border.h" #include "ui/views/layout/box_layout.h" #include "ui/views/layout/grid_layout.h" diff --git a/ash/wm/ash_native_cursor_manager_unittest.cc b/ash/wm/ash_native_cursor_manager_unittest.cc index ba7de8a..01def5e 100644 --- a/ash/wm/ash_native_cursor_manager_unittest.cc +++ b/ash/wm/ash_native_cursor_manager_unittest.cc @@ -23,8 +23,8 @@ #endif #if defined(USE_X11) -#include "grit/ui_resources.h" #include "ui/base/cursor/cursor_loader_x11.h" +#include "ui/resources/grit/ui_resources.h" #endif namespace ash { |