diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-13 20:13:25 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-13 20:13:25 +0000 |
| commit | 57506de01a982ec0a3aad7ba80323f4048ab8197 (patch) | |
| tree | ed0ae521837a643ff5b873542cf6d047b8e5fae5 /ash | |
| parent | 5666725bc5c72d2b5a33edd36a411a68be607a98 (diff) | |
| download | chromium_src-57506de01a982ec0a3aad7ba80323f4048ab8197.zip chromium_src-57506de01a982ec0a3aad7ba80323f4048ab8197.tar.gz chromium_src-57506de01a982ec0a3aad7ba80323f4048ab8197.tar.bz2 | |
Revert r156610 "add ash_resources.grd and necessary changes to use images in ash/resources"
TBR=oshima@chromium.org
BUG=146034
TEST=none
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156614 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
49 files changed, 43 insertions, 356 deletions
@@ -1,7 +1,6 @@ include_rules = [ "+chromeos", "+content/public", - "+grit/ash_resources.h", "+grit/ash_strings.h", "+grit/ui_resources.h", "+grit/ui_resources_wallpapers.h", diff --git a/ash/ash.gyp b/ash/ash.gyp index 6b4f47f..b3e9612 100644 --- a/ash/ash.gyp +++ b/ash/ash.gyp @@ -7,9 +7,7 @@ 'chromium_code': 1, 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', }, - 'includes': [ - 'ash_resources.gypi', - ], + 'targets': [ { 'target_name': 'ash', @@ -38,7 +36,6 @@ '../ui/views/controls/webview/webview.gyp:webview', '../ui/views/views.gyp:views', '../ui/web_dialogs/web_dialogs.gyp:web_dialogs', - 'ash_resources', ], 'defines': [ 'ASH_IMPLEMENTATION', @@ -444,7 +441,6 @@ '../ui/views/views.gyp:views_examples_with_content_lib', '../ui/views/views.gyp:test_support_views', 'ash', - 'ash_resources', ], 'sources': [ '../ui/views/test/test_views_delegate.cc', @@ -586,7 +582,6 @@ '../ui/views/views.gyp:views_examples_with_content_lib', '../ui/views/views.gyp:test_support_views', 'ash', - 'ash_resources', ], 'sources': [ 'shell/app_list.cc', diff --git a/ash/ash_resources.gypi b/ash/ash_resources.gypi deleted file mode 100644 index 5c2d62a..0000000 --- a/ash/ash_resources.gypi +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) 2012 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -{ - 'targets': [ - { - 'target_name': 'ash_resources', - 'type': 'none', - 'variables': { - 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ash/ash_resources', - }, - 'actions': [ - { - 'action_name': 'ash_resources', - 'variables': { - 'grit_grd_file': 'resources/ash_resources.grd', - }, - 'includes': [ '../build/grit_action.gypi' ], - }, - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)/ash/ash_resources', - ], - }, - }, - ], -} diff --git a/ash/desktop_background/desktop_background_controller.cc b/ash/desktop_background/desktop_background_controller.cc index cb186ad..752eb1f 100644 --- a/ash/desktop_background/desktop_background_controller.cc +++ b/ash/desktop_background/desktop_background_controller.cc @@ -14,6 +14,7 @@ #include "base/logging.h" #include "base/synchronization/cancellation_flag.h" #include "base/threading/worker_pool.h" +#include "grit/ui_resources.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" #include "ui/base/resource/resource_bundle.h" diff --git a/ash/desktop_background/desktop_background_view.cc b/ash/desktop_background/desktop_background_view.cc index c703786..7369304 100644 --- a/ash/desktop_background/desktop_background_view.cc +++ b/ash/desktop_background/desktop_background_view.cc @@ -14,6 +14,7 @@ #include "ash/wm/window_animations.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" +#include "grit/ui_resources.h" #include "ui/aura/root_window.h" #include "ui/base/resource/resource_bundle.h" #include "ui/compositor/layer.h" diff --git a/ash/display/secondary_display_view.cc b/ash/display/secondary_display_view.cc index a79237b..ea8963e 100644 --- a/ash/display/secondary_display_view.cc +++ b/ash/display/secondary_display_view.cc @@ -4,8 +4,8 @@ #include "ash/display/secondary_display_view.h" -#include "grit/ash_resources.h" #include "grit/ash_strings.h" +#include "grit/ui_resources.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/aura/window.h" #include "ui/base/l10n/l10n_util.h" diff --git a/ash/launcher/app_list_button.cc b/ash/launcher/app_list_button.cc index 3a551ed..7fc3eac 100644 --- a/ash/launcher/app_list_button.cc +++ b/ash/launcher/app_list_button.cc @@ -8,8 +8,8 @@ #include "ash/launcher/launcher_button_host.h" #include "ash/launcher/launcher_types.h" -#include "grit/ash_resources.h" #include "grit/ash_strings.h" +#include "grit/ui_resources.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/ash/launcher/launcher.cc b/ash/launcher/launcher.cc index 73df792..17addd0 100644 --- a/ash/launcher/launcher.cc +++ b/ash/launcher/launcher.cc @@ -16,7 +16,7 @@ #include "ash/shell_delegate.h" #include "ash/shell_window_ids.h" #include "ash/wm/shelf_layout_manager.h" -#include "grit/ash_resources.h" +#include "grit/ui_resources.h" #include "ui/aura/window.h" #include "ui/base/resource/resource_bundle.h" #include "ui/compositor/layer.h" diff --git a/ash/launcher/launcher_button.cc b/ash/launcher/launcher_button.cc index a3848ab..e271e64 100644 --- a/ash/launcher/launcher_button.cc +++ b/ash/launcher/launcher_button.cc @@ -7,7 +7,7 @@ #include <algorithm> #include "ash/launcher/launcher_button_host.h" -#include "grit/ash_resources.h" +#include "grit/ui_resources.h" #include "skia/ext/image_operations.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/animation/animation_delegate.h" diff --git a/ash/launcher/launcher_view.cc b/ash/launcher/launcher_view.cc index e5e493a..8918838 100644 --- a/ash/launcher/launcher_view.cc +++ b/ash/launcher/launcher_view.cc @@ -20,7 +20,7 @@ #include "base/auto_reset.h" #include "base/memory/scoped_ptr.h" #include "grit/ash_strings.h" -#include "grit/ash_resources.h" +#include "grit/ui_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/simple_menu_model.h" #include "ui/base/resource/resource_bundle.h" diff --git a/ash/launcher/launcher_view_unittest.cc b/ash/launcher/launcher_view_unittest.cc index 0c18eb2..0a260f5 100644 --- a/ash/launcher/launcher_view_unittest.cc +++ b/ash/launcher/launcher_view_unittest.cc @@ -19,7 +19,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "grit/ash_resources.h" +#include "grit/ui_resources.h" #include "ui/aura/test/aura_test_base.h" #include "ui/aura/window.h" #include "ui/base/events/event.h" diff --git a/ash/launcher/overflow_button.cc b/ash/launcher/overflow_button.cc index c06d448..4ff8432 100644 --- a/ash/launcher/overflow_button.cc +++ b/ash/launcher/overflow_button.cc @@ -4,8 +4,8 @@ #include "ash/launcher/overflow_button.h" -#include "grit/ash_resources.h" #include "grit/ash_strings.h" +#include "grit/ui_resources.h" #include "third_party/skia/include/core/SkPaint.h" #include "third_party/skia/include/core/SkPath.h" #include "ui/base/animation/throb_animation.h" diff --git a/ash/launcher/tabbed_launcher_button.cc b/ash/launcher/tabbed_launcher_button.cc index 75f62e2..5e6ab7d 100644 --- a/ash/launcher/tabbed_launcher_button.cc +++ b/ash/launcher/tabbed_launcher_button.cc @@ -8,7 +8,7 @@ #include "ash/launcher/launcher_button_host.h" #include "ash/launcher/launcher_types.h" -#include "grit/ash_resources.h" +#include "grit/ui_resources.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/animation/multi_animation.h" #include "ui/base/resource/resource_bundle.h" diff --git a/ash/resources/PRESUBMIT.py b/ash/resources/PRESUBMIT.py deleted file mode 100644 index 9d070e4..0000000 --- a/ash/resources/PRESUBMIT.py +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright (c) 2012 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -"""Presubmit script for Chromium Ash resources. - -See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts -for more details about the presubmit API built into gcl/git cl, and see -http://www.chromium.org/developers/web-development-style-guide for the rules -we're checking against here. -""" - - -def CheckChangeOnUpload(input_api, output_api): - return _CommonChecks(input_api, output_api) - - -def CheckChangeOnCommit(input_api, output_api): - return _CommonChecks(input_api, output_api) - - -def _CommonChecks(input_api, output_api): - """Checks common to both upload and commit.""" - results = [] - resources = input_api.os_path.join(input_api.PresubmitLocalPath(), - '../../ui/resources') - - # List of paths with their associated scale factor. This is used to verify - # that the images modified in one are the correct scale of the other. - path_scales = [ - [(100, 'default_100_percent/'), (200, 'default_200_percent/')], - ] - - import sys - old_path = sys.path - - try: - sys.path = [resources] + old_path - from resource_check import resource_scale_factors - - for paths in path_scales: - results.extend(resource_scale_factors.ResourceScaleFactors( - input_api, output_api, paths).RunChecks()) - finally: - sys.path = old_path - - return results diff --git a/ash/resources/ash_resources.grd b/ash/resources/ash_resources.grd deleted file mode 100644 index 8d32e43..0000000 --- a/ash/resources/ash_resources.grd +++ /dev/null @@ -1,235 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<grit latest_public_release="0" current_release="1"> - <outputs> - <output filename="grit/ash_resources.h" type="rc_header" context="default_100_percent"> - <emit emit_type='prepend'></emit> - </output> - <output filename="grit/ash_resources_map.cc" type="resource_map_source" context="default_100_percent" /> - <output filename="grit/ash_resources_map.h" type="resource_map_header" context="default_100_percent" /> - <output filename="ash_resources_100_percent.pak" type="data_package" context="default_100_percent" /> - <output filename="ash_resources_200_percent.pak" type="data_package" context="default_200_percent" /> - </outputs> - <release seq="1"> - <structures fallback_to_low_resolution="true"> - <!-- KEEP THESE IN ALPHABETICAL ORDER! DO NOT ADD TO RANDOM PLACES JUST - BECAUSE YOUR RESOURCES ARE FUNCTIONALLY RELATED OR FALL UNDER THE - SAME CONDITIONALS. --> - <!-- ChromeOS specific pointers --> - <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_ALIAS" file="cros/pointers/alias.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_CELL" file="cros/pointers/cell.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_COL_RESIZE" file="cros/pointers/sb_h_double_arrow.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_CONTEXT_MENU" file="cros/pointers/context_menu.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_COPY" file="cros/pointers/copy.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_CROSSHAIR" file="cros/pointers/crosshair.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_EAST_RESIZE" file="cros/pointers/sb_h_double_arrow.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_EAST_WEST_RESIZE" file="cros/pointers/sb_h_double_arrow.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_FLEUR" file="cros/pointers/fleur.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_HAND" file="cros/pointers/hand2.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_HELP" file="cros/pointers/help.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_IBEAM" file="cros/pointers/xterm.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_MOVE" file="cros/pointers/move.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_NORTH_EAST_RESIZE" file="cros/pointers/top_right_corner.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_NORTH_EAST_SOUTH_WEST_RESIZE" file="cros/pointers/top_right_corner.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_NORTH_RESIZE" file="cros/pointers/sb_v_double_arrow.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_NORTH_SOUTH_RESIZE" file="cros/pointers/sb_v_double_arrow.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_NORTH_WEST_RESIZE" file="cros/pointers/top_left_corner.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_NORTH_WEST_SOUTH_EAST_RESIZE" file="cros/pointers/top_left_corner.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_NO_DROP" file="cros/pointers/nodrop.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_PTR" file="cros/pointers/left_ptr.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_ROW_RESIZE" file="cros/pointers/sb_v_double_arrow.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_SOUTH_EAST_RESIZE" file="cros/pointers/top_left_corner.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_SOUTH_RESIZE" file="cros/pointers/sb_v_double_arrow.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_SOUTH_WEST_RESIZE" file="cros/pointers/top_right_corner.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_WEST_RESIZE" file="cros/pointers/sb_h_double_arrow.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_XTERM_HORIZ" file="cros/pointers/xterm_horiz.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_ZOOM_IN" file="cros/pointers/zoom_in.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_ZOOM_OUT" file="cros/pointers/zoom_out.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_GRAB" file="cros/pointers/fleur.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_GRABBING" file="cros/pointers/hand3.png" /> - - <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_BACKGROUND" file="common/launcher_background.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_BROWSER" file="common/launcher_browser.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_BROWSER_PANEL" file="common/launcher_browser_panel.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_BROWSER_SHORTCUT" file="common/chromium-32.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_DIMMING" file="common/launcher_dimming.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_ICON_APPLIST" file="common/launcher_applist.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_ICON_APPLIST_HOT" file="common/launcher_applist_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_ICON_APPLIST_PUSHED" file="common/launcher_applist_pressed.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_INCOGNITO_BROWSER" file="common/launcher_incognito_browser.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_INCOGNITO_BROWSER_PANEL" file="common/launcher_incognito_browser_panel.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_NEW_BROWSER" file="common/new_browser.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_NEW_BROWSER_HOT" file="common/new_browser_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_NEW_BROWSER_PUSHED" file="common/new_browser_pressed.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_OVERFLOW" file="common/launcher_overflow.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_UNDERLINE_ACTIVE" file="common/launcher_underline_active.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_UNDERLINE_HOVER" file="common/launcher_underline_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_UNDERLINE_RUNNING" file="common/launcher_underline_running.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_UNDERLINE_VERTICAL_ACTIVE" file="common/launcher_underline_active.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_UNDERLINE_VERTICAL_HOVER" file="common/launcher_underline_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_UNDERLINE_VERTICAL_RUNNING" file="common/launcher_underline_running.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_MULTI_WINDOW_RESIZE_H" file="common/multi_window_resize_horizontal.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_MULTI_WINDOW_RESIZE_V" file="common/multi_window_resize_vertical.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_RESIZE_SHADOW_BOTTOM" file="common/resize_shadow_bottom.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_RESIZE_SHADOW_BOTTOM_LEFT" file="common/resize_shadow_bottom_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_RESIZE_SHADOW_BOTTOM_RIGHT" file="common/resize_shadow_bottom_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_RESIZE_SHADOW_LEFT" file="common/resize_shadow_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_RESIZE_SHADOW_RIGHT" file="common/resize_shadow_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_RESIZE_SHADOW_TOP" file="common/resize_shadow_top.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_RESIZE_SHADOW_TOP_LEFT" file="common/resize_shadow_top_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_RESIZE_SHADOW_TOP_RIGHT" file="common/resize_shadow_top_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_ACTIVE_BOTTOM" file="common/window_shadow_active_bottom.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_ACTIVE_BOTTOM_LEFT" file="common/window_shadow_active_bottom_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_ACTIVE_BOTTOM_RIGHT" file="common/window_shadow_active_bottom_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_ACTIVE_LEFT" file="common/window_shadow_active_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_ACTIVE_RIGHT" file="common/window_shadow_active_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_ACTIVE_TOP" file="common/window_shadow_active_top.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_ACTIVE_TOP_LEFT" file="common/window_shadow_active_top_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_ACTIVE_TOP_RIGHT" file="common/window_shadow_active_top_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_INACTIVE_BOTTOM" file="common/window_shadow_inactive_bottom.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_INACTIVE_BOTTOM_LEFT" file="common/window_shadow_inactive_bottom_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_INACTIVE_BOTTOM_RIGHT" file="common/window_shadow_inactive_bottom_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_INACTIVE_LEFT" file="common/window_shadow_inactive_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_INACTIVE_RIGHT" file="common/window_shadow_inactive_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_INACTIVE_TOP" file="common/window_shadow_inactive_top.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_INACTIVE_TOP_LEFT" file="common/window_shadow_inactive_top_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_INACTIVE_TOP_RIGHT" file="common/window_shadow_inactive_top_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_SMALL_BOTTOM" file="common/small_shadow_bottom.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_SMALL_BOTTOM_LEFT" file="common/small_shadow_bottom_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_SMALL_BOTTOM_RIGHT" file="common/small_shadow_bottom_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_SMALL_LEFT" file="common/small_shadow_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_SMALL_RIGHT" file="common/small_shadow_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_SMALL_TOP" file="common/small_shadow_top.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_SMALL_TOP_LEFT" file="common/small_shadow_top_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_SMALL_TOP_RIGHT" file="common/small_shadow_top_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SWITCH_MONITOR" file="common/switch_monitor.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_ACCESSIBILITY" file="common/status_accessibility_mode.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_ACCESSIBILITY_DARK" file="common/status_accessibility_dark.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_BLUETOOTH" file="common/status_bluetooth.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED" file="common/status_bluetooth_disabled.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED_HOVER" file="common/status_bluetooth_disabled_h.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED" file="common/status_bluetooth_enabled.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED_HOVER" file="common/status_bluetooth_enabled_h.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_BRIGHTNESS" file="common/status_brightness.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_CAPS_LOCK" file="common/status_capslock.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_CAPS_LOCK_DARK" file="common/status_capslock_dark.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_CELLULAR_DISABLED" file="common/status_cellular_disabled.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_CELLULAR_DISABLED_HOVER" file="common/status_cellular_disabled_h.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_CELLULAR_ENABLED" file="common/status_cellular_enabled.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_CELLULAR_ENABLED_HOVER" file="common/status_cellular_enabled_h.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_DISPLAY" file="common/status_display.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_DISPLAY_HOVER" file="common/status_display_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_DISPLAY_PRESSED" file="common/status_display_pressed.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_DRIVE" file="common/status_drive.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_DRIVE_CANCEL" file="common/status_drive_item_cancel.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_DRIVE_CANCEL_HOVER" file="common/status_drive_item_cancel_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_DRIVE_DONE" file="common/status_drive_item_done.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_DRIVE_FAILED" file="common/status_drive_item_failed.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_DRIVE_LIGHT" file="common/status_drive_light.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_HELP" file="common/status_help.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_HELP_HOVER" file="common/status_help_h.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_IME" file="common/status_ime.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_LESS" file="common/status_less.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_LOCALE" file="common/status_locale.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_LOCKSCREEN" file="common/status_lockscreen.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_LOCKSCREEN_HOVER" file="common/status_lockscreen_h.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_MORE" file="common/status_more.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_DATA_LOW" file="common/status_data_low.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_DATA_NONE" file="common/status_data_none.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_FAILED" file="common/status_network_failed.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_INFO" file="common/status_network_info.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_INFO_HOVER" file="common/status_network_info_h.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_POWER_SMALL" file="common/status_power_small_all.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_POWER_SMALL_DARK" file="common/status_power_small_all_dark.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SETTINGS" file="common/status_settings.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SHUTDOWN" file="common/status_shutdown.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SHUTDOWN_HOVER" file="common/status_shutdown_h.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SMS" file="common/status_sms.png" /> - - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE" file="common/status_update.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE_GREEN" file="common/status_update_green.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE_ORANGE" file="common/status_update_orange.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE_RED" file="common/status_update_red.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE_DARK" file="common/status_update_dark.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE_DARK_GREEN" file="common/status_update_dark_green.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE_DARK_ORANGE" file="common/status_update_dark_orange.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE_DARK_RED" file="common/status_update_dark_red.png" /> - - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_VOLUME_LEVELS" file="common/status_volume_dark.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_VOLUME_MUTE" file="common/status_volume_mute.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_DISABLED" file="common/status_wifi_disabled.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_DISABLED_HOVER" file="common/status_wifi_disabled_h.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_ENABLED" file="common/status_wifi_enabled.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_ENABLED_HOVER" file="common/status_wifi_enabled_h.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NOTIFY_CLOSE" file="common/status_notify_x.png" /> - - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NOTIFY_BUTTON_ACTIVE_NORMAL" file="common/notification/notification_button_active_normal.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NOTIFY_BUTTON_ACTIVE_HOVER" file="common/notification/notification_button_active_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NOTIFY_BUTTON_ACTIVE_PRESSED" file="common/notification/notification_button_active_pressed.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NOTIFY_BUTTON_INACTIVE_NORMAL" file="common/notification/notification_button_inactive_normal.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NOTIFY_BUTTON_INACTIVE_HOVER" file="common/notification/notification_button_inactive_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NOTIFY_BUTTON_INACTIVE_PRESSED" file="common/notification/notification_button_inactive_pressed.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_BUTTON_SEPARATOR" file="common/window_button_separator.png" /> - - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE" file="common/window_close_fullscreen_normal.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE_H" file="common/window_close_fullscreen_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE_P" file="common/window_close_fullscreen_pressed.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE" file="common/window_size_fullscreen_normal.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE_H" file="common/window_size_fullscreen_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE_P" file="common/window_size_fullscreen_pressed.png" /> - - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_SHADOW" file="common/window_fullscreen_shadow.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_BASE_ACTIVE" file="common/window_header_base_active.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_BASE_INACTIVE" file="common/window_header_base_inactive.png" /> - <!-- TODO(jamescook): We need updated incognito art for Aura. --> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_BASE_INCOGNITO_ACTIVE" file="common/window_header_base_incognito_active.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_BASE_INCOGNITO_INACTIVE" file="common/window_header_base_incognito_inactive.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_BOTTOM" file="common/window_header_shade_bottom.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_BOTTOM_LEFT" file="common/window_header_shade_bottom_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_BOTTOM_RIGHT" file="common/window_header_shade_bottom_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_LEFT" file="common/window_header_shade_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_MIDDLE" file="common/window_header_shade_middle.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_RIGHT" file="common/window_header_shade_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_TOP" file="common/window_header_shade_top.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_TOP_LEFT" file="common/window_header_shade_top_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_TOP_RIGHT" file="common/window_header_shade_top_right.png" /> - - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CLOSE" file="common/window_close_tall_normal.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CLOSE_H" file="common/window_close_tall_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CLOSE_P" file="common/window_close_tall_pressed.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE" file="common/window_close_short_normal.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE_H" file="common/window_close_short_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE_P" file="common/window_close_short_pressed.png" /> - <!-- These are temporary, when workspace2 is the default they'll replace IDR_AURA_WINDOW_MAXIMIZED_CLOSE --> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE2" file="common/window_close_short_black_normal.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE2_H" file="common/window_close_short_black_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE2_P" file="common/window_close_short_black_pressed.png" /> - - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZE" file="common/window_size_tall_normal.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZE_H" file="common/window_size_tall_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZE_P" file="common/window_size_tall_pressed.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE" file="common/window_size_short_normal.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE_H" file="common/window_size_short_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE_P" file="common/window_size_short_pressed.png" /> - <!-- These are temporary, when workspace2 is the default they'll replace IDR_AURA_WINDOW_MAXIMIZED_RESTORE --> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE2" file="common/window_size_short_black_normal.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE2_H" file="common/window_size_short_black_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE2_P" file="common/window_size_short_black_pressed.png" /> - - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_LEFT" file="common/window_position_left_normal.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_LEFT_H" file="common/window_position_left_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_LEFT_P" file="common/window_position_left_pressed.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_MIDDLE" file="common/window_position_middle_normal.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_MIDDLE_H" file="common/window_position_middle_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_MIDDLE_P" file="common/window_position_middle_pressed.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_RIGHT" file="common/window_position_right_normal.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_RIGHT_H" file="common/window_position_right_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_RIGHT_P" file="common/window_position_right_pressed.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_LEFT_RESTORE" file="common/window_position_left_normal_restore.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_LEFT_RESTORE_H" file="common/window_position_left_hover_restore.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_LEFT_RESTORE_P" file="common/window_position_left_pressed_restore.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_RIGHT_RESTORE" file="common/window_position_right_normal_restore.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_RIGHT_RESTORE_H" file="common/window_position_right_hover_restore.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_RIGHT_RESTORE_P" file="common/window_position_right_pressed_restore.png" /> - </structures> - </release> -</grit> diff --git a/ash/shell.cc b/ash/shell.cc index d331778..a28be51 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -67,6 +67,7 @@ #include "ash/wm/workspace_controller.h" #include "base/bind.h" #include "base/command_line.h" +#include "grit/ui_resources.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/user_action_client.h" #include "ui/aura/display_manager.h" diff --git a/ash/shell/launcher_delegate_impl.cc b/ash/shell/launcher_delegate_impl.cc index 315c875..c53dec7 100644 --- a/ash/shell/launcher_delegate_impl.cc +++ b/ash/shell/launcher_delegate_impl.cc @@ -8,7 +8,7 @@ #include "ash/shell/toplevel_window.h" #include "ash/shell/window_watcher.h" #include "ash/wm/window_util.h" -#include "grit/ash_resources.h" +#include "grit/ui_resources.h" #include "ui/aura/window.h" namespace ash { diff --git a/ash/system/audio/tray_volume.cc b/ash/system/audio/tray_volume.cc index 38a37a1..89f57e0 100644 --- a/ash/system/audio/tray_volume.cc +++ b/ash/system/audio/tray_volume.cc @@ -12,8 +12,8 @@ #include "ash/system/tray/tray_views.h" #include "ash/volume_control_delegate.h" #include "base/utf_string_conversions.h" -#include "grit/ash_resources.h" #include "grit/ash_strings.h" +#include "grit/ui_resources.h" #include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkPaint.h" #include "third_party/skia/include/core/SkRect.h" diff --git a/ash/system/bluetooth/tray_bluetooth.cc b/ash/system/bluetooth/tray_bluetooth.cc index 2165bcd..1ec3eef 100644 --- a/ash/system/bluetooth/tray_bluetooth.cc +++ b/ash/system/bluetooth/tray_bluetooth.cc @@ -11,8 +11,8 @@ #include "ash/system/tray/tray_details_view.h" #include "ash/system/tray/tray_item_more.h" #include "ash/system/tray/tray_views.h" -#include "grit/ash_resources.h" #include "grit/ash_strings.h" +#include "grit/ui_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" diff --git a/ash/system/brightness/tray_brightness.cc b/ash/system/brightness/tray_brightness.cc index 73132b3..3c5e040 100644 --- a/ash/system/brightness/tray_brightness.cc +++ b/ash/system/brightness/tray_brightness.cc @@ -13,8 +13,8 @@ #include "base/bind.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" -#include "grit/ash_resources.h" #include "grit/ash_strings.h" +#include "grit/ui_resources.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" #include "ui/views/controls/button/image_button.h" diff --git a/ash/system/date/tray_date.cc b/ash/system/date/tray_date.cc index d8cc6e2..fb512d9 100644 --- a/ash/system/date/tray_date.cc +++ b/ash/system/date/tray_date.cc @@ -16,8 +16,8 @@ #include "base/time.h" #include "base/timer.h" #include "base/utf_string_conversions.h" -#include "grit/ash_resources.h" #include "grit/ash_strings.h" +#include "grit/ui_resources.h" #include "third_party/skia/include/core/SkRect.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" diff --git a/ash/system/drive/tray_drive.cc b/ash/system/drive/tray_drive.cc index f37ad80..1d90741 100644 --- a/ash/system/drive/tray_drive.cc +++ b/ash/system/drive/tray_drive.cc @@ -18,8 +18,8 @@ #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/stl_util.h" -#include "grit/ash_resources.h" #include "grit/ash_strings.h" +#include "grit/ui_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/font.h" diff --git a/ash/system/ime/tray_ime.cc b/ash/system/ime/tray_ime.cc index 5f72fbb..0251490 100644 --- a/ash/system/ime/tray_ime.cc +++ b/ash/system/ime/tray_ime.cc @@ -19,8 +19,8 @@ #include "base/logging.h" #include "base/timer.h" #include "base/utf_string_conversions.h" -#include "grit/ash_resources.h" #include "grit/ash_strings.h" +#include "grit/ui_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/font.h" diff --git a/ash/system/locale/tray_locale.cc b/ash/system/locale/tray_locale.cc index 805e155..c09be0c 100644 --- a/ash/system/locale/tray_locale.cc +++ b/ash/system/locale/tray_locale.cc @@ -8,8 +8,8 @@ #include "ash/system/tray/tray_notification_view.h" #include "ash/system/tray/tray_views.h" #include "base/string16.h" -#include "grit/ash_resources.h" #include "grit/ash_strings.h" +#include "grit/ui_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/views/view.h" diff --git a/ash/system/network/tray_network.cc b/ash/system/network/tray_network.cc index 8b28f07..b54eb68 100644 --- a/ash/system/network/tray_network.cc +++ b/ash/system/network/tray_network.cc @@ -15,8 +15,8 @@ #include "ash/system/tray/tray_notification_view.h" #include "ash/system/tray/tray_views.h" #include "base/utf_string_conversions.h" -#include "grit/ash_resources.h" #include "grit/ash_strings.h" +#include "grit/ui_resources.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/aura/window.h" #include "ui/base/l10n/l10n_util.h" diff --git a/ash/system/network/tray_sms.cc b/ash/system/network/tray_sms.cc index 7aca24f..b7680b1 100644 --- a/ash/system/network/tray_sms.cc +++ b/ash/system/network/tray_sms.cc @@ -16,8 +16,8 @@ #include "base/command_line.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" -#include "grit/ash_resources.h" #include "grit/ash_strings.h" +#include "grit/ui_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/views/controls/image_view.h" diff --git a/ash/system/power/tray_power.cc b/ash/system/power/tray_power.cc index 816d22a..229d369 100644 --- a/ash/system/power/tray_power.cc +++ b/ash/system/power/tray_power.cc @@ -17,8 +17,8 @@ #include "base/string_number_conversions.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" -#include "grit/ash_resources.h" #include "grit/ash_strings.h" +#include "grit/ui_resources.h" #include "third_party/skia/include/core/SkRect.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/ash/system/settings/tray_settings.cc b/ash/system/settings/tray_settings.cc index ae1823d..a79ea5f 100644 --- a/ash/system/settings/tray_settings.cc +++ b/ash/system/settings/tray_settings.cc @@ -11,8 +11,8 @@ #include "ash/system/tray/tray_views.h" #include "base/logging.h" #include "base/utf_string_conversions.h" -#include "grit/ash_resources.h" #include "grit/ash_strings.h" +#include "grit/ui_resources.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/resource/resource_bundle.h" diff --git a/ash/system/status_area_widget_delegate.cc b/ash/system/status_area_widget_delegate.cc index 13b84842..f3c1c34 100644 --- a/ash/system/status_area_widget_delegate.cc +++ b/ash/system/status_area_widget_delegate.cc @@ -9,6 +9,7 @@ #include "ash/shell.h" #include "ash/shell_window_ids.h" #include "base/utf_string_conversions.h" +#include "grit/ui_resources.h" #include "ui/aura/root_window.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" diff --git a/ash/system/tray/tray_item_more.cc b/ash/system/tray/tray_item_more.cc index df659b9..e4314e5 100644 --- a/ash/system/tray/tray_item_more.cc +++ b/ash/system/tray/tray_item_more.cc @@ -7,7 +7,7 @@ #include "ash/system/tray/system_tray_item.h" #include "ash/system/tray/tray_constants.h" #include "ash/system/tray/tray_views.h" -#include "grit/ash_resources.h" +#include "grit/ui_resources.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" diff --git a/ash/system/tray/tray_notification_view.cc b/ash/system/tray/tray_notification_view.cc index 4e82c89..fd7cba2 100644 --- a/ash/system/tray/tray_notification_view.cc +++ b/ash/system/tray/tray_notification_view.cc @@ -6,8 +6,8 @@ #include "ash/system/tray/system_tray_item.h" #include "ash/system/tray/tray_constants.h" -#include "grit/ash_resources.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/views/controls/button/image_button.h" diff --git a/ash/system/tray/tray_views.cc b/ash/system/tray/tray_views.cc index 9a60e27..1aa2050 100644 --- a/ash/system/tray/tray_views.cc +++ b/ash/system/tray/tray_views.cc @@ -6,7 +6,6 @@ #include "ash/system/tray/tray_constants.h" #include "ash/system/tray/tray_item_view.h" -#include "grit/ash_resources.h" #include "grit/ash_strings.h" #include "grit/ui_resources.h" #include "ui/base/accessibility/accessible_view_state.h" diff --git a/ash/system/tray_accessibility.cc b/ash/system/tray_accessibility.cc index 7b7a3be..95adc42 100644 --- a/ash/system/tray_accessibility.cc +++ b/ash/system/tray_accessibility.cc @@ -8,8 +8,8 @@ #include "ash/shell_delegate.h" #include "ash/system/tray/tray_constants.h" #include "ash/system/tray/tray_views.h" -#include "grit/ash_resources.h" #include "grit/ash_strings.h" +#include "grit/ui_resources.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" #include "ui/views/controls/image_view.h" diff --git a/ash/system/tray_caps_lock.cc b/ash/system/tray_caps_lock.cc index 357c6ee..c1d3cef 100644 --- a/ash/system/tray_caps_lock.cc +++ b/ash/system/tray_caps_lock.cc @@ -8,8 +8,8 @@ #include "ash/shell.h" #include "ash/system/tray/tray_constants.h" #include "ash/system/tray/tray_views.h" -#include "grit/ash_resources.h" #include "grit/ash_strings.h" +#include "grit/ui_resources.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" diff --git a/ash/system/tray_display.cc b/ash/system/tray_display.cc index 2a07e90..910fbbe 100644 --- a/ash/system/tray_display.cc +++ b/ash/system/tray_display.cc @@ -11,8 +11,8 @@ #include "ash/system/tray/tray_constants.h" #include "ash/system/tray/tray_views.h" #include "base/utf_string_conversions.h" -#include "grit/ash_resources.h" #include "grit/ash_strings.h" +#include "grit/ui_resources.h" #include "ui/aura/display_manager.h" #include "ui/aura/env.h" #include "ui/base/l10n/l10n_util.h" diff --git a/ash/system/tray_update.cc b/ash/system/tray_update.cc index cc39e47..899dce2 100644 --- a/ash/system/tray_update.cc +++ b/ash/system/tray_update.cc @@ -12,8 +12,8 @@ #include "ash/wm/shelf_layout_manager.h" #include "base/time.h" #include "base/timer.h" -#include "grit/ash_resources.h" #include "grit/ash_strings.h" +#include "grit/ui_resources.h" #include "ui/aura/window.h" #include "ui/base/resource/resource_bundle.h" #include "ui/compositor/layer.h" diff --git a/ash/system/web_notification/web_notification_tray.cc b/ash/system/web_notification/web_notification_tray.cc index 58ce164..1fc74a1 100644 --- a/ash/system/web_notification/web_notification_tray.cc +++ b/ash/system/web_notification/web_notification_tray.cc @@ -13,8 +13,8 @@ #include "base/stringprintf.h" #include "base/timer.h" #include "base/utf_string_conversions.h" -#include "grit/ash_resources.h" #include "grit/ash_strings.h" +#include "grit/ui_resources.h" #include "ui/aura/window.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/simple_menu_model.h" diff --git a/ash/test/test_launcher_delegate.cc b/ash/test/test_launcher_delegate.cc index 19de713..4e05c4d 100644 --- a/ash/test/test_launcher_delegate.cc +++ b/ash/test/test_launcher_delegate.cc @@ -7,7 +7,7 @@ #include "ash/launcher/launcher_model.h" #include "ash/wm/window_util.h" #include "base/utf_string_conversions.h" -#include "grit/ash_resources.h" +#include "grit/ui_resources.h" #include "ui/aura/window.h" namespace ash { diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc index 4213132..9496ccf 100644 --- a/ash/test/test_shell_delegate.cc +++ b/ash/test/test_shell_delegate.cc @@ -11,6 +11,7 @@ #include "ash/shell_window_ids.h" #include "ash/test/test_launcher_delegate.h" #include "content/public/test/test_browser_context.h" +#include "grit/ui_resources.h" #include "ui/aura/window.h" namespace ash { diff --git a/ash/wm/custom_frame_view_ash.cc b/ash/wm/custom_frame_view_ash.cc index 7aba0b4..12c3542 100644 --- a/ash/wm/custom_frame_view_ash.cc +++ b/ash/wm/custom_frame_view_ash.cc @@ -6,7 +6,7 @@ #include "ash/wm/frame_painter.h" #include "ash/wm/workspace/frame_maximize_button.h" -#include "grit/ash_resources.h" +#include "grit/ui_resources.h" #include "grit/ui_strings.h" // Accessibility names #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/ash/wm/frame_painter.cc b/ash/wm/frame_painter.cc index 89a0ed73..01f3a80 100644 --- a/ash/wm/frame_painter.cc +++ b/ash/wm/frame_painter.cc @@ -11,7 +11,7 @@ #include "ash/wm/window_util.h" #include "ash/wm/workspace_controller.h" #include "base/logging.h" // DCHECK -#include "grit/ash_resources.h" +#include "grit/ui_resources.h" #include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/core/SkPaint.h" diff --git a/ash/wm/frame_painter_unittest.cc b/ash/wm/frame_painter_unittest.cc index 88da751..870761e 100644 --- a/ash/wm/frame_painter_unittest.cc +++ b/ash/wm/frame_painter_unittest.cc @@ -9,7 +9,7 @@ #include "ash/test/ash_test_base.h" #include "ash/wm/property_util.h" #include "base/memory/scoped_ptr.h" -#include "grit/ash_resources.h" +#include "grit/ui_resources.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/aura/root_window.h" #include "ui/base/hit_test.h" diff --git a/ash/wm/image_cursors.cc b/ash/wm/image_cursors.cc index c893fdc..b0ec3f5 100644 --- a/ash/wm/image_cursors.cc +++ b/ash/wm/image_cursors.cc @@ -8,7 +8,6 @@ #include "ui/base/cursor/cursor_loader.h" #include "ui/base/cursor/cursor.h" #include "ui/gfx/point.h" -#include "grit/ash_resources.h" #include "grit/ui_resources.h" namespace { diff --git a/ash/wm/maximize_bubble_controller.cc b/ash/wm/maximize_bubble_controller.cc index 6f66278..16d0422 100644 --- a/ash/wm/maximize_bubble_controller.cc +++ b/ash/wm/maximize_bubble_controller.cc @@ -9,8 +9,8 @@ #include "ash/wm/window_animations.h" #include "ash/wm/workspace/frame_maximize_button.h" #include "base/timer.h" -#include "grit/ash_resources.h" #include "grit/ash_strings.h" +#include "grit/ui_resources.h" #include "third_party/skia/include/core/SkPath.h" #include "ui/aura/focus_manager.h" #include "ui/aura/window.h" diff --git a/ash/wm/panel_frame_view.cc b/ash/wm/panel_frame_view.cc index fee4988..90a79b3 100644 --- a/ash/wm/panel_frame_view.cc +++ b/ash/wm/panel_frame_view.cc @@ -4,7 +4,7 @@ #include "ash/wm/frame_painter.h" #include "ash/wm/panel_frame_view.h" -#include "grit/ash_resources.h" +#include "grit/ui_resources.h" #include "grit/ui_strings.h" // Accessibility names #include "third_party/skia/include/core/SkPaint.h" #include "ui/base/animation/throb_animation.h" diff --git a/ash/wm/resize_shadow.cc b/ash/wm/resize_shadow.cc index 95ed9f1..805783f 100644 --- a/ash/wm/resize_shadow.cc +++ b/ash/wm/resize_shadow.cc @@ -6,7 +6,7 @@ #include "ash/wm/image_grid.h" #include "base/time.h" -#include "grit/ash_resources.h" +#include "grit/ui_resources.h" #include "ui/aura/window.h" #include "ui/base/hit_test.h" #include "ui/base/resource/resource_bundle.h" diff --git a/ash/wm/shadow.cc b/ash/wm/shadow.cc index 2f720c6..7cd2fea 100644 --- a/ash/wm/shadow.cc +++ b/ash/wm/shadow.cc @@ -5,7 +5,7 @@ #include "ash/wm/shadow.h" #include "ash/wm/image_grid.h" -#include "grit/ash_resources.h" +#include "grit/ui_resources.h" #include "ui/base/resource/resource_bundle.h" #include "ui/compositor/scoped_layer_animation_settings.h" diff --git a/ash/wm/workspace/frame_maximize_button.cc b/ash/wm/workspace/frame_maximize_button.cc index 1ffa5b8..1654068b 100644 --- a/ash/wm/workspace/frame_maximize_button.cc +++ b/ash/wm/workspace/frame_maximize_button.cc @@ -12,6 +12,7 @@ #include "ash/wm/workspace/phantom_window_controller.h" #include "ash/wm/workspace/snap_sizer.h" #include "grit/ash_strings.h" +#include "grit/ui_resources.h" #include "ui/aura/event_filter.h" #include "ui/aura/window.h" #include "ui/base/events/event.h" diff --git a/ash/wm/workspace/multi_window_resize_controller.cc b/ash/wm/workspace/multi_window_resize_controller.cc index 35b8122..e9dc788 100644 --- a/ash/wm/workspace/multi_window_resize_controller.cc +++ b/ash/wm/workspace/multi_window_resize_controller.cc @@ -10,7 +10,7 @@ #include "ash/wm/window_animations.h" #include "ash/wm/workspace/workspace_event_handler.h" #include "ash/wm/workspace/workspace_window_resizer.h" -#include "grit/ash_resources.h" +#include "grit/ui_resources.h" #include "ui/aura/client/screen_position_client.h" #include "ui/aura/event_filter.h" #include "ui/aura/root_window.h" |