diff options
| author | tfarina <tfarina@chromium.org> | 2014-08-25 09:56:12 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-25 16:57:39 +0000 |
| commit | 0aff6f3f6d49226f59a6b5adce44b1cd0b30ffbd (patch) | |
| tree | 086cd9f94a7b3471cd3e31ab536d5aaae1612e62 /ash | |
| parent | 4ee32c2f8b7d2fd5a216a877b2b939fb4bad2ffa (diff) | |
| download | chromium_src-0aff6f3f6d49226f59a6b5adce44b1cd0b30ffbd.zip chromium_src-0aff6f3f6d49226f59a6b5adce44b1cd0b30ffbd.tar.gz chromium_src-0aff6f3f6d49226f59a6b5adce44b1cd0b30ffbd.tar.bz2 | |
Use qualified path for grit/ui_strings.h
This was generated by the following command line:
$ for f in $(g grep -l '"grit/ui_strings.h"' -- '*.cc' '*.mm' '*.h'); do
sed -i -e 's/"grit\/ui_strings.h"/"ui\/strings\/grit\/ui_strings.h"/' $f;
done
$ python ./tools/git/for-all-touched-files.py -c "./tools/sort-headers.py -f [[FILENAME]]"
BUG=401588
TEST=None
R=thestig@chromium.org,thakis@chromium.org
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/499163002
Cr-Commit-Position: refs/heads/master@{#291700}
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/DEPS | 1 | ||||
| -rw-r--r-- | ash/frame/caption_buttons/frame_caption_button_container_view.cc | 2 | ||||
| -rw-r--r-- | ash/system/web_notification/web_notification_tray.cc | 2 |
3 files changed, 2 insertions, 3 deletions
@@ -6,7 +6,6 @@ include_rules = [ "+gpu/config", "+grit/ash_resources.h", "+grit/ash_strings.h", - "+grit/ui_strings.h", "+media", "+skia/ext", "+third_party/cros_system_api", diff --git a/ash/frame/caption_buttons/frame_caption_button_container_view.cc b/ash/frame/caption_buttons/frame_caption_button_container_view.cc index b084ec4..b9dc745 100644 --- a/ash/frame/caption_buttons/frame_caption_button_container_view.cc +++ b/ash/frame/caption_buttons/frame_caption_button_container_view.cc @@ -13,7 +13,6 @@ #include "ash/metrics/user_metrics_recorder.h" #include "ash/shell.h" #include "ash/wm/maximize_mode/maximize_mode_controller.h" -#include "grit/ui_strings.h" // Accessibility names #include "ui/base/hit_test.h" #include "ui/base/l10n/l10n_util.h" #include "ui/compositor/scoped_animation_duration_scale_mode.h" @@ -22,6 +21,7 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/insets.h" #include "ui/gfx/point.h" +#include "ui/strings/grit/ui_strings.h" // Accessibility names #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_delegate.h" diff --git a/ash/system/web_notification/web_notification_tray.cc b/ash/system/web_notification/web_notification_tray.cc index e42c0f9..13bf02b 100644 --- a/ash/system/web_notification/web_notification_tray.cc +++ b/ash/system/web_notification/web_notification_tray.cc @@ -23,7 +23,6 @@ #include "base/i18n/rtl.h" #include "base/strings/utf_string_conversions.h" #include "grit/ash_strings.h" -#include "grit/ui_strings.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/base/l10n/l10n_util.h" @@ -33,6 +32,7 @@ #include "ui/message_center/views/message_bubble_base.h" #include "ui/message_center/views/message_center_bubble.h" #include "ui/message_center/views/message_popup_collection.h" +#include "ui/strings/grit/ui_strings.h" #include "ui/views/bubble/tray_bubble_view.h" #include "ui/views/controls/button/custom_button.h" #include "ui/views/controls/image_view.h" |