diff options
398 files changed, 386 insertions, 335 deletions
@@ -1,6 +1,7 @@ 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 b3e9612..6b4f47f 100644 --- a/ash/ash.gyp +++ b/ash/ash.gyp @@ -7,7 +7,9 @@ 'chromium_code': 1, 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', }, - + 'includes': [ + 'ash_resources.gypi', + ], 'targets': [ { 'target_name': 'ash', @@ -36,6 +38,7 @@ '../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', @@ -441,6 +444,7 @@ '../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', @@ -582,6 +586,7 @@ '../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 new file mode 100644 index 0000000..5c2d62a --- /dev/null +++ b/ash/ash_resources.gypi @@ -0,0 +1,29 @@ +# 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 752eb1f..cb186ad 100644 --- a/ash/desktop_background/desktop_background_controller.cc +++ b/ash/desktop_background/desktop_background_controller.cc @@ -14,7 +14,6 @@ #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 7369304..c703786 100644 --- a/ash/desktop_background/desktop_background_view.cc +++ b/ash/desktop_background/desktop_background_view.cc @@ -14,7 +14,6 @@ #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 ea8963e..a79237b 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 7fc3eac..3a551ed 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 17addd0..73df792 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/ui_resources.h" +#include "grit/ash_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 e271e64..a3848ab 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/ui_resources.h" +#include "grit/ash_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 8918838..e5e493a 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/ui_resources.h" +#include "grit/ash_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 0a260f5..0c18eb2 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/ui_resources.h" +#include "grit/ash_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 4ff8432..c06d448 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 5e6ab7d..75f62e2 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/ui_resources.h" +#include "grit/ash_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 new file mode 100644 index 0000000..9d070e4 --- /dev/null +++ b/ash/resources/PRESUBMIT.py @@ -0,0 +1,47 @@ +# 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 new file mode 100644 index 0000000..8d32e43 --- /dev/null +++ b/ash/resources/ash_resources.grd @@ -0,0 +1,235 @@ +<?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 a28be51..d331778 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -67,7 +67,6 @@ #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 c53dec7..315c875 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/ui_resources.h" +#include "grit/ash_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 89f57e0..38a37a1 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 1ec3eef..2165bcd 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 3c5e040..73132b3 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 fb512d9..d8cc6e2 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 1d90741..f37ad80 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 0251490..5f72fbb 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 c09be0c..805e155 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 b54eb68..8b28f07 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 b7680b1..7aca24f 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 229d369..816d22a 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 a79ea5f..ae1823d 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 f3c1c34..13b84842 100644 --- a/ash/system/status_area_widget_delegate.cc +++ b/ash/system/status_area_widget_delegate.cc @@ -9,7 +9,6 @@ #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 e4314e5..df659b9 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/ui_resources.h" +#include "grit/ash_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 fd7cba2..4e82c89 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 1aa2050..9a60e27 100644 --- a/ash/system/tray/tray_views.cc +++ b/ash/system/tray/tray_views.cc @@ -6,6 +6,7 @@ #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 95adc42..7b7a3be 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 c1d3cef..357c6ee 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 910fbbe..2a07e90 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 899dce2..cc39e47 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 1fc74a1..58ce164 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 4e05c4d..19de713 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/ui_resources.h" +#include "grit/ash_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 9496ccf..4213132 100644 --- a/ash/test/test_shell_delegate.cc +++ b/ash/test/test_shell_delegate.cc @@ -11,7 +11,6 @@ #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 12c3542..7aba0b4 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/ui_resources.h" +#include "grit/ash_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 01f3a80..89a0ed73 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/ui_resources.h" +#include "grit/ash_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 870761e..88da751 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/ui_resources.h" +#include "grit/ash_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 b0ec3f5..c893fdc 100644 --- a/ash/wm/image_cursors.cc +++ b/ash/wm/image_cursors.cc @@ -8,6 +8,7 @@ #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 16d0422..6f66278 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 90a79b3..fee4988 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/ui_resources.h" +#include "grit/ash_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 805783f..95ed9f1 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/ui_resources.h" +#include "grit/ash_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 7cd2fea..2f720c6 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/ui_resources.h" +#include "grit/ash_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 1654068b..1ffa5b8 100644 --- a/ash/wm/workspace/frame_maximize_button.cc +++ b/ash/wm/workspace/frame_maximize_button.cc @@ -12,7 +12,6 @@ #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 e9dc788..35b8122 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/ui_resources.h" +#include "grit/ash_resources.h" #include "ui/aura/client/screen_position_client.h" #include "ui/aura/event_filter.h" #include "ui/aura/root_window.h" diff --git a/chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.cc b/chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.cc index ac73167..445a4bc 100644 --- a/chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.cc +++ b/chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.cc @@ -18,9 +18,9 @@ #include "chrome/browser/ui/views/tabs/tab_strip.h" #include "chrome/browser/ui/views/toolbar_view.h" #include "content/public/browser/web_contents.h" +#include "grit/ash_resources.h" #include "grit/generated_resources.h" // Accessibility names #include "grit/theme_resources.h" -#include "grit/ui_resources.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/window.h" #include "ui/base/accessibility/accessible_view_state.h" diff --git a/chrome/browser/ui/views/frame/app_non_client_frame_view_aura.cc b/chrome/browser/ui/views/frame/app_non_client_frame_view_aura.cc index 5d61d82..0be6d62 100644 --- a/chrome/browser/ui/views/frame/app_non_client_frame_view_aura.cc +++ b/chrome/browser/ui/views/frame/app_non_client_frame_view_aura.cc @@ -7,9 +7,9 @@ #include "base/debug/stack_trace.h" #include "chrome/browser/ui/views/frame/browser_frame.h" #include "chrome/browser/ui/views/frame/browser_view.h" +#include "grit/ash_resources.h" #include "grit/generated_resources.h" // Accessibility names #include "grit/theme_resources.h" -#include "grit/ui_resources.h" #include "ui/aura/window.h" #include "ui/base/hit_test.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi index adc9f08..530cfb1 100644 --- a/chrome/chrome_browser_ui.gypi +++ b/chrome/chrome_browser_ui.gypi @@ -2202,6 +2202,8 @@ ['include', '^browser/ui/webui/certificate_viewer_ui.h'], ], 'dependencies': [ + # aura uses some of ash resources. + '../ash/ash.gyp:ash_resources', '../ui/aura/aura.gyp:aura', '../ui/compositor/compositor.gyp:compositor', ], diff --git a/chrome/chrome_repack_chrome_100_percent.gypi b/chrome/chrome_repack_chrome_100_percent.gypi index 8759593..da717c9 100644 --- a/chrome/chrome_repack_chrome_100_percent.gypi +++ b/chrome/chrome_repack_chrome_100_percent.gypi @@ -9,6 +9,13 @@ '<(grit_out_dir)/theme_resources_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak', ], + 'conditions': [ + ['use_aura==1', { + 'pak_inputs': [ + '<(SHARED_INTERMEDIATE_DIR)/ash/ash_resources/ash_resources_100_percent.pak', + ], + }], + ], }, 'inputs': [ '<(repack_path)', diff --git a/chrome/chrome_repack_chrome_200_percent.gypi b/chrome/chrome_repack_chrome_200_percent.gypi index 1d1da38..158b012 100644 --- a/chrome/chrome_repack_chrome_200_percent.gypi +++ b/chrome/chrome_repack_chrome_200_percent.gypi @@ -10,6 +10,13 @@ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_200_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_200_percent.pak', ], + 'conditions': [ + ['use_aura==1', { + 'pak_inputs': [ + '<(SHARED_INTERMEDIATE_DIR)/ash/ash_resources/ash_resources_200_percent.pak', + ], + }], + ], }, 'inputs': [ '<(repack_path)', diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp index 66f8a88..4f48abd 100644 --- a/chrome/chrome_resources.gyp +++ b/chrome/chrome_resources.gyp @@ -264,8 +264,6 @@ 'chrome_strings', 'platform_locale_settings', 'theme_resources', - # TODO(zork): Protect this with if use_aura==1 - '<(DEPTH)/ash/ash_strings.gyp:ash_strings', '<(DEPTH)/content/content_resources.gyp:content_resources', '<(DEPTH)/net/net.gyp:net_resources', '<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings', @@ -301,6 +299,12 @@ }, ], 'conditions': [ + ['use_aura==1', { + 'dependencies': [ + '<(DEPTH)/ash/ash.gyp:ash_resources', + '<(DEPTH)/ash/ash_strings.gyp:ash_strings', + ], + }], ['OS != "mac"', { # Copy pak files to the product directory. These files will be picked # up by the following installer scripts: diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 0d6431f..faff32d 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -2141,6 +2141,9 @@ 'sources': [ 'browser/ui/app_list/apps_model_builder_unittest.cc', ], + 'dependencies': [ + '../ash/ash.gyp:ash_resources', + ], }], ['use_aura==1', { 'dependencies': [ diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids index 077cffa..a3facee 100644 --- a/tools/gritsettings/resource_ids +++ b/tools/gritsettings/resource_ids @@ -54,6 +54,9 @@ "ui/resources/ui_resources.grd": { "structures": [6000], }, + "ash/resources/ash_resources.grd": { + "structures": [6200], + }, "chrome/app/theme/theme_resources.grd": { "includes": [6500], "structures": [7000], diff --git a/ui/resources/default_100_percent/ash/PRESUBMIT.py b/ui/resources/default_100_percent/ash/PRESUBMIT.py deleted file mode 100644 index 954e749..0000000 --- a/ui/resources/default_100_percent/ash/PRESUBMIT.py +++ /dev/null @@ -1,12 +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. - -"""Chromium presubmit script for src/ui/resources/default_100_percent/ash/. - -See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts -for more details on the presubmit API built into gcl. -""" - -def GetPreferredTrySlaves(): - return ['linux_chromeos', 'win_aura'] diff --git a/ui/resources/default_100_percent/ash/launcher_applist.png b/ui/resources/default_100_percent/ash/launcher_applist.png Binary files differdeleted file mode 100644 index 8cf67bd..0000000 --- a/ui/resources/default_100_percent/ash/launcher_applist.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/launcher_applist_hover.png b/ui/resources/default_100_percent/ash/launcher_applist_hover.png Binary files differdeleted file mode 100644 index 0fbca85..0000000 --- a/ui/resources/default_100_percent/ash/launcher_applist_hover.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/launcher_applist_pressed.png b/ui/resources/default_100_percent/ash/launcher_applist_pressed.png Binary files differdeleted file mode 100644 index 747f7e8..0000000 --- a/ui/resources/default_100_percent/ash/launcher_applist_pressed.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/launcher_background.png b/ui/resources/default_100_percent/ash/launcher_background.png Binary files differdeleted file mode 100644 index 2ad1bdb..0000000 --- a/ui/resources/default_100_percent/ash/launcher_background.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/launcher_browser.png b/ui/resources/default_100_percent/ash/launcher_browser.png Binary files differdeleted file mode 100644 index 00b7c53..0000000 --- a/ui/resources/default_100_percent/ash/launcher_browser.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/launcher_browser_panel.png b/ui/resources/default_100_percent/ash/launcher_browser_panel.png Binary files differdeleted file mode 100644 index 9d2d91c..0000000 --- a/ui/resources/default_100_percent/ash/launcher_browser_panel.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/launcher_dimming.png b/ui/resources/default_100_percent/ash/launcher_dimming.png Binary files differdeleted file mode 100644 index a0ec071..0000000 --- a/ui/resources/default_100_percent/ash/launcher_dimming.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/launcher_incognito_browser.png b/ui/resources/default_100_percent/ash/launcher_incognito_browser.png Binary files differdeleted file mode 100644 index a4fbb29..0000000 --- a/ui/resources/default_100_percent/ash/launcher_incognito_browser.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/launcher_incognito_browser_panel.png b/ui/resources/default_100_percent/ash/launcher_incognito_browser_panel.png Binary files differdeleted file mode 100644 index 112ea8b..0000000 --- a/ui/resources/default_100_percent/ash/launcher_incognito_browser_panel.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/launcher_overflow.png b/ui/resources/default_100_percent/ash/launcher_overflow.png Binary files differdeleted file mode 100644 index 179ae02..0000000 --- a/ui/resources/default_100_percent/ash/launcher_overflow.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/launcher_underline_active.png b/ui/resources/default_100_percent/ash/launcher_underline_active.png Binary files differdeleted file mode 100644 index 5b9c467..0000000 --- a/ui/resources/default_100_percent/ash/launcher_underline_active.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/launcher_underline_hover.png b/ui/resources/default_100_percent/ash/launcher_underline_hover.png Binary files differdeleted file mode 100644 index dd7be77..0000000 --- a/ui/resources/default_100_percent/ash/launcher_underline_hover.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/launcher_underline_running.png b/ui/resources/default_100_percent/ash/launcher_underline_running.png Binary files differdeleted file mode 100644 index 92ab244..0000000 --- a/ui/resources/default_100_percent/ash/launcher_underline_running.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/multi_window_resize_hover.png b/ui/resources/default_100_percent/ash/multi_window_resize_hover.png Binary files differdeleted file mode 100644 index 49ba487..0000000 --- a/ui/resources/default_100_percent/ash/multi_window_resize_hover.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/multi_window_resize_v.png b/ui/resources/default_100_percent/ash/multi_window_resize_v.png Binary files differdeleted file mode 100644 index f093a61..0000000 --- a/ui/resources/default_100_percent/ash/multi_window_resize_v.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/new_browser.png b/ui/resources/default_100_percent/ash/new_browser.png Binary files differdeleted file mode 100644 index 0b7ddae..0000000 --- a/ui/resources/default_100_percent/ash/new_browser.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/new_browser_hover.png b/ui/resources/default_100_percent/ash/new_browser_hover.png Binary files differdeleted file mode 100644 index 67b9805..0000000 --- a/ui/resources/default_100_percent/ash/new_browser_hover.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/new_browser_pressed.png b/ui/resources/default_100_percent/ash/new_browser_pressed.png Binary files differdeleted file mode 100644 index d37490d..0000000 --- a/ui/resources/default_100_percent/ash/new_browser_pressed.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/notification_button_active_hover.png b/ui/resources/default_100_percent/ash/notification_button_active_hover.png Binary files differdeleted file mode 100644 index 745c988..0000000 --- a/ui/resources/default_100_percent/ash/notification_button_active_hover.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/notification_button_active_normal.png b/ui/resources/default_100_percent/ash/notification_button_active_normal.png Binary files differdeleted file mode 100644 index 1be789c..0000000 --- a/ui/resources/default_100_percent/ash/notification_button_active_normal.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/notification_button_active_pressed.png b/ui/resources/default_100_percent/ash/notification_button_active_pressed.png Binary files differdeleted file mode 100644 index 91ecb6f..0000000 --- a/ui/resources/default_100_percent/ash/notification_button_active_pressed.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/notification_button_inactive_hover.png b/ui/resources/default_100_percent/ash/notification_button_inactive_hover.png Binary files differdeleted file mode 100644 index 1fca7b7..0000000 --- a/ui/resources/default_100_percent/ash/notification_button_inactive_hover.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/notification_button_inactive_normal.png b/ui/resources/default_100_percent/ash/notification_button_inactive_normal.png Binary files differdeleted file mode 100644 index f34ac78..0000000 --- a/ui/resources/default_100_percent/ash/notification_button_inactive_normal.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/notification_button_inactive_pressed.png b/ui/resources/default_100_percent/ash/notification_button_inactive_pressed.png Binary files differdeleted file mode 100644 index 77a6766..0000000 --- a/ui/resources/default_100_percent/ash/notification_button_inactive_pressed.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/resize_shadow_bottom.png b/ui/resources/default_100_percent/ash/resize_shadow_bottom.png Binary files differdeleted file mode 100644 index d5d9123..0000000 --- a/ui/resources/default_100_percent/ash/resize_shadow_bottom.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/resize_shadow_bottom_left.png b/ui/resources/default_100_percent/ash/resize_shadow_bottom_left.png Binary files differdeleted file mode 100644 index 8128c06..0000000 --- a/ui/resources/default_100_percent/ash/resize_shadow_bottom_left.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/resize_shadow_bottom_right.png b/ui/resources/default_100_percent/ash/resize_shadow_bottom_right.png Binary files differdeleted file mode 100644 index 93f039b..0000000 --- a/ui/resources/default_100_percent/ash/resize_shadow_bottom_right.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/resize_shadow_left.png b/ui/resources/default_100_percent/ash/resize_shadow_left.png Binary files differdeleted file mode 100644 index e85ab7c..0000000 --- a/ui/resources/default_100_percent/ash/resize_shadow_left.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/resize_shadow_right.png b/ui/resources/default_100_percent/ash/resize_shadow_right.png Binary files differdeleted file mode 100644 index 0ebf1d6..0000000 --- a/ui/resources/default_100_percent/ash/resize_shadow_right.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/resize_shadow_top.png b/ui/resources/default_100_percent/ash/resize_shadow_top.png Binary files differdeleted file mode 100644 index 35b95f6..0000000 --- a/ui/resources/default_100_percent/ash/resize_shadow_top.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/resize_shadow_top_left.png b/ui/resources/default_100_percent/ash/resize_shadow_top_left.png Binary files differdeleted file mode 100644 index 9f7f296..0000000 --- a/ui/resources/default_100_percent/ash/resize_shadow_top_left.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/resize_shadow_top_right.png b/ui/resources/default_100_percent/ash/resize_shadow_top_right.png Binary files differdeleted file mode 100644 index f4a9aef..0000000 --- a/ui/resources/default_100_percent/ash/resize_shadow_top_right.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/small_shadow_bottom.png b/ui/resources/default_100_percent/ash/small_shadow_bottom.png Binary files differdeleted file mode 100644 index 96558f7..0000000 --- a/ui/resources/default_100_percent/ash/small_shadow_bottom.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/small_shadow_bottom_left.png b/ui/resources/default_100_percent/ash/small_shadow_bottom_left.png Binary files differdeleted file mode 100644 index 1badab6..0000000 --- a/ui/resources/default_100_percent/ash/small_shadow_bottom_left.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/small_shadow_bottom_right.png b/ui/resources/default_100_percent/ash/small_shadow_bottom_right.png Binary files differdeleted file mode 100644 index fe92d77..0000000 --- a/ui/resources/default_100_percent/ash/small_shadow_bottom_right.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/small_shadow_left.png b/ui/resources/default_100_percent/ash/small_shadow_left.png Binary files differdeleted file mode 100644 index 1615283..0000000 --- a/ui/resources/default_100_percent/ash/small_shadow_left.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/small_shadow_right.png b/ui/resources/default_100_percent/ash/small_shadow_right.png Binary files differdeleted file mode 100644 index b445a78..0000000 --- a/ui/resources/default_100_percent/ash/small_shadow_right.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/small_shadow_top.png b/ui/resources/default_100_percent/ash/small_shadow_top.png Binary files differdeleted file mode 100644 index ffd617a..0000000 --- a/ui/resources/default_100_percent/ash/small_shadow_top.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/small_shadow_top_left.png b/ui/resources/default_100_percent/ash/small_shadow_top_left.png Binary files differdeleted file mode 100644 index 8f14327..0000000 --- a/ui/resources/default_100_percent/ash/small_shadow_top_left.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/small_shadow_top_right.png b/ui/resources/default_100_percent/ash/small_shadow_top_right.png Binary files differdeleted file mode 100644 index 61b2d68..0000000 --- a/ui/resources/default_100_percent/ash/small_shadow_top_right.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_accessibility_dark.png b/ui/resources/default_100_percent/ash/status_accessibility_dark.png Binary files differdeleted file mode 100644 index f1a8332..0000000 --- a/ui/resources/default_100_percent/ash/status_accessibility_dark.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_accessibility_mode.png b/ui/resources/default_100_percent/ash/status_accessibility_mode.png Binary files differdeleted file mode 100644 index a80a8c0..0000000 --- a/ui/resources/default_100_percent/ash/status_accessibility_mode.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_bluetooth.png b/ui/resources/default_100_percent/ash/status_bluetooth.png Binary files differdeleted file mode 100644 index 6b987607..0000000 --- a/ui/resources/default_100_percent/ash/status_bluetooth.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_bluetooth_disabled.png b/ui/resources/default_100_percent/ash/status_bluetooth_disabled.png Binary files differdeleted file mode 100644 index 10d8d6c..0000000 --- a/ui/resources/default_100_percent/ash/status_bluetooth_disabled.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_bluetooth_disabled_h.png b/ui/resources/default_100_percent/ash/status_bluetooth_disabled_h.png Binary files differdeleted file mode 100644 index 8483f42..0000000 --- a/ui/resources/default_100_percent/ash/status_bluetooth_disabled_h.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_bluetooth_enabled.png b/ui/resources/default_100_percent/ash/status_bluetooth_enabled.png Binary files differdeleted file mode 100644 index 4f6d811..0000000 --- a/ui/resources/default_100_percent/ash/status_bluetooth_enabled.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_bluetooth_enabled_h.png b/ui/resources/default_100_percent/ash/status_bluetooth_enabled_h.png Binary files differdeleted file mode 100644 index 527fdf4..0000000 --- a/ui/resources/default_100_percent/ash/status_bluetooth_enabled_h.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_brightness.png b/ui/resources/default_100_percent/ash/status_brightness.png Binary files differdeleted file mode 100644 index 70672ef..0000000 --- a/ui/resources/default_100_percent/ash/status_brightness.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_capslock.png b/ui/resources/default_100_percent/ash/status_capslock.png Binary files differdeleted file mode 100644 index fffb5d4..0000000 --- a/ui/resources/default_100_percent/ash/status_capslock.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_capslock_dark.png b/ui/resources/default_100_percent/ash/status_capslock_dark.png Binary files differdeleted file mode 100644 index ffdbabff..0000000 --- a/ui/resources/default_100_percent/ash/status_capslock_dark.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_cellular_disabled.png b/ui/resources/default_100_percent/ash/status_cellular_disabled.png Binary files differdeleted file mode 100644 index 23a9e9f..0000000 --- a/ui/resources/default_100_percent/ash/status_cellular_disabled.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_cellular_disabled_h.png b/ui/resources/default_100_percent/ash/status_cellular_disabled_h.png Binary files differdeleted file mode 100644 index 2f9ff49..0000000 --- a/ui/resources/default_100_percent/ash/status_cellular_disabled_h.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_cellular_enabled.png b/ui/resources/default_100_percent/ash/status_cellular_enabled.png Binary files differdeleted file mode 100644 index 6616f05..0000000 --- a/ui/resources/default_100_percent/ash/status_cellular_enabled.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_cellular_enabled_h.png b/ui/resources/default_100_percent/ash/status_cellular_enabled_h.png Binary files differdeleted file mode 100644 index 24b9e43..0000000 --- a/ui/resources/default_100_percent/ash/status_cellular_enabled_h.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_data_low.png b/ui/resources/default_100_percent/ash/status_data_low.png Binary files differdeleted file mode 100644 index 825825e..0000000 --- a/ui/resources/default_100_percent/ash/status_data_low.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_data_none.png b/ui/resources/default_100_percent/ash/status_data_none.png Binary files differdeleted file mode 100644 index 9f506d8..0000000 --- a/ui/resources/default_100_percent/ash/status_data_none.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_display.png b/ui/resources/default_100_percent/ash/status_display.png Binary files differdeleted file mode 100644 index a65d03c..0000000 --- a/ui/resources/default_100_percent/ash/status_display.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_display_hover.png b/ui/resources/default_100_percent/ash/status_display_hover.png Binary files differdeleted file mode 100644 index bedae8b..0000000 --- a/ui/resources/default_100_percent/ash/status_display_hover.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_display_pressed.png b/ui/resources/default_100_percent/ash/status_display_pressed.png Binary files differdeleted file mode 100644 index da789b8..0000000 --- a/ui/resources/default_100_percent/ash/status_display_pressed.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_drive.png b/ui/resources/default_100_percent/ash/status_drive.png Binary files differdeleted file mode 100644 index affd263..0000000 --- a/ui/resources/default_100_percent/ash/status_drive.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_drive_item_cancel.png b/ui/resources/default_100_percent/ash/status_drive_item_cancel.png Binary files differdeleted file mode 100644 index 8a7d270..0000000 --- a/ui/resources/default_100_percent/ash/status_drive_item_cancel.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_drive_item_cancel_hover.png b/ui/resources/default_100_percent/ash/status_drive_item_cancel_hover.png Binary files differdeleted file mode 100644 index 33750f4c..0000000 --- a/ui/resources/default_100_percent/ash/status_drive_item_cancel_hover.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_drive_item_done.png b/ui/resources/default_100_percent/ash/status_drive_item_done.png Binary files differdeleted file mode 100644 index e55f50b..0000000 --- a/ui/resources/default_100_percent/ash/status_drive_item_done.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_drive_item_failed.png b/ui/resources/default_100_percent/ash/status_drive_item_failed.png Binary files differdeleted file mode 100644 index fcf99da..0000000 --- a/ui/resources/default_100_percent/ash/status_drive_item_failed.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_drive_light.png b/ui/resources/default_100_percent/ash/status_drive_light.png Binary files differdeleted file mode 100644 index 7b44b57..0000000 --- a/ui/resources/default_100_percent/ash/status_drive_light.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_help.png b/ui/resources/default_100_percent/ash/status_help.png Binary files differdeleted file mode 100644 index 77d8c93308..0000000 --- a/ui/resources/default_100_percent/ash/status_help.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_help_h.png b/ui/resources/default_100_percent/ash/status_help_h.png Binary files differdeleted file mode 100644 index 5f6ca9e..0000000 --- a/ui/resources/default_100_percent/ash/status_help_h.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_ime.png b/ui/resources/default_100_percent/ash/status_ime.png Binary files differdeleted file mode 100644 index b75ac39..0000000 --- a/ui/resources/default_100_percent/ash/status_ime.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_less.png b/ui/resources/default_100_percent/ash/status_less.png Binary files differdeleted file mode 100644 index 8dadc4e..0000000 --- a/ui/resources/default_100_percent/ash/status_less.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_locale.png b/ui/resources/default_100_percent/ash/status_locale.png Binary files differdeleted file mode 100644 index 981eb45..0000000 --- a/ui/resources/default_100_percent/ash/status_locale.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_lockscreen.png b/ui/resources/default_100_percent/ash/status_lockscreen.png Binary files differdeleted file mode 100644 index c01889f..0000000 --- a/ui/resources/default_100_percent/ash/status_lockscreen.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_lockscreen_h.png b/ui/resources/default_100_percent/ash/status_lockscreen_h.png Binary files differdeleted file mode 100644 index 2fe49a3..0000000 --- a/ui/resources/default_100_percent/ash/status_lockscreen_h.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_more.png b/ui/resources/default_100_percent/ash/status_more.png Binary files differdeleted file mode 100644 index ac9e1be..0000000 --- a/ui/resources/default_100_percent/ash/status_more.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_network_failed.png b/ui/resources/default_100_percent/ash/status_network_failed.png Binary files differdeleted file mode 100644 index 99d5269..0000000 --- a/ui/resources/default_100_percent/ash/status_network_failed.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_network_info.png b/ui/resources/default_100_percent/ash/status_network_info.png Binary files differdeleted file mode 100644 index a1052ca..0000000 --- a/ui/resources/default_100_percent/ash/status_network_info.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_network_info_h.png b/ui/resources/default_100_percent/ash/status_network_info_h.png Binary files differdeleted file mode 100644 index 8820990..0000000 --- a/ui/resources/default_100_percent/ash/status_network_info_h.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_notify_x.png b/ui/resources/default_100_percent/ash/status_notify_x.png Binary files differdeleted file mode 100644 index fc136d5..0000000 --- a/ui/resources/default_100_percent/ash/status_notify_x.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_power_small_all.png b/ui/resources/default_100_percent/ash/status_power_small_all.png Binary files differdeleted file mode 100644 index 0bfe4ba..0000000 --- a/ui/resources/default_100_percent/ash/status_power_small_all.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_power_small_all_dark.png b/ui/resources/default_100_percent/ash/status_power_small_all_dark.png Binary files differdeleted file mode 100644 index 0ac864af..0000000 --- a/ui/resources/default_100_percent/ash/status_power_small_all_dark.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_settings.png b/ui/resources/default_100_percent/ash/status_settings.png Binary files differdeleted file mode 100644 index 6a0068d..0000000 --- a/ui/resources/default_100_percent/ash/status_settings.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_shutdown.png b/ui/resources/default_100_percent/ash/status_shutdown.png Binary files differdeleted file mode 100644 index f30e23d..0000000 --- a/ui/resources/default_100_percent/ash/status_shutdown.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_shutdown_h.png b/ui/resources/default_100_percent/ash/status_shutdown_h.png Binary files differdeleted file mode 100644 index b35c26c..0000000 --- a/ui/resources/default_100_percent/ash/status_shutdown_h.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_sms.png b/ui/resources/default_100_percent/ash/status_sms.png Binary files differdeleted file mode 100644 index aca1890..0000000 --- a/ui/resources/default_100_percent/ash/status_sms.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_update.png b/ui/resources/default_100_percent/ash/status_update.png Binary files differdeleted file mode 100644 index 60c48e9..0000000 --- a/ui/resources/default_100_percent/ash/status_update.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_update_dark.png b/ui/resources/default_100_percent/ash/status_update_dark.png Binary files differdeleted file mode 100644 index 94b571c..0000000 --- a/ui/resources/default_100_percent/ash/status_update_dark.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_update_dark_green.png b/ui/resources/default_100_percent/ash/status_update_dark_green.png Binary files differdeleted file mode 100644 index 2912184..0000000 --- a/ui/resources/default_100_percent/ash/status_update_dark_green.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_update_dark_orange.png b/ui/resources/default_100_percent/ash/status_update_dark_orange.png Binary files differdeleted file mode 100644 index fd16653..0000000 --- a/ui/resources/default_100_percent/ash/status_update_dark_orange.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_update_dark_red.png b/ui/resources/default_100_percent/ash/status_update_dark_red.png Binary files differdeleted file mode 100644 index efae2d7..0000000 --- a/ui/resources/default_100_percent/ash/status_update_dark_red.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_update_green.png b/ui/resources/default_100_percent/ash/status_update_green.png Binary files differdeleted file mode 100644 index 007cb44..0000000 --- a/ui/resources/default_100_percent/ash/status_update_green.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_update_orange.png b/ui/resources/default_100_percent/ash/status_update_orange.png Binary files differdeleted file mode 100644 index caa98e2..0000000 --- a/ui/resources/default_100_percent/ash/status_update_orange.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_update_red.png b/ui/resources/default_100_percent/ash/status_update_red.png Binary files differdeleted file mode 100644 index c58bbfa..0000000 --- a/ui/resources/default_100_percent/ash/status_update_red.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_volume_dark.png b/ui/resources/default_100_percent/ash/status_volume_dark.png Binary files differdeleted file mode 100644 index 310384f..0000000 --- a/ui/resources/default_100_percent/ash/status_volume_dark.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_volume_mute.png b/ui/resources/default_100_percent/ash/status_volume_mute.png Binary files differdeleted file mode 100644 index 8b05e26..0000000 --- a/ui/resources/default_100_percent/ash/status_volume_mute.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_wifi_disabled.png b/ui/resources/default_100_percent/ash/status_wifi_disabled.png Binary files differdeleted file mode 100644 index 5ccc894..0000000 --- a/ui/resources/default_100_percent/ash/status_wifi_disabled.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_wifi_disabled_h.png b/ui/resources/default_100_percent/ash/status_wifi_disabled_h.png Binary files differdeleted file mode 100644 index 5056a52..0000000 --- a/ui/resources/default_100_percent/ash/status_wifi_disabled_h.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_wifi_enabled.png b/ui/resources/default_100_percent/ash/status_wifi_enabled.png Binary files differdeleted file mode 100644 index e794614..0000000 --- a/ui/resources/default_100_percent/ash/status_wifi_enabled.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/status_wifi_enabled_h.png b/ui/resources/default_100_percent/ash/status_wifi_enabled_h.png Binary files differdeleted file mode 100644 index 827a0ee..0000000 --- a/ui/resources/default_100_percent/ash/status_wifi_enabled_h.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/switch_monitor.png b/ui/resources/default_100_percent/ash/switch_monitor.png Binary files differdeleted file mode 100644 index 5e94ec6..0000000 --- a/ui/resources/default_100_percent/ash/switch_monitor.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/window_shadow_active_bottom.png b/ui/resources/default_100_percent/ash/window_shadow_active_bottom.png Binary files differdeleted file mode 100644 index 7a8d9f6..0000000 --- a/ui/resources/default_100_percent/ash/window_shadow_active_bottom.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/window_shadow_active_bottom_left.png b/ui/resources/default_100_percent/ash/window_shadow_active_bottom_left.png Binary files differdeleted file mode 100644 index 8e4d5e2..0000000 --- a/ui/resources/default_100_percent/ash/window_shadow_active_bottom_left.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/window_shadow_active_bottom_right.png b/ui/resources/default_100_percent/ash/window_shadow_active_bottom_right.png Binary files differdeleted file mode 100644 index 943e84c..0000000 --- a/ui/resources/default_100_percent/ash/window_shadow_active_bottom_right.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/window_shadow_active_left.png b/ui/resources/default_100_percent/ash/window_shadow_active_left.png Binary files differdeleted file mode 100644 index f63bfff..0000000 --- a/ui/resources/default_100_percent/ash/window_shadow_active_left.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/window_shadow_active_right.png b/ui/resources/default_100_percent/ash/window_shadow_active_right.png Binary files differdeleted file mode 100644 index d318ed1..0000000 --- a/ui/resources/default_100_percent/ash/window_shadow_active_right.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/window_shadow_active_top.png b/ui/resources/default_100_percent/ash/window_shadow_active_top.png Binary files differdeleted file mode 100644 index 08d0773..0000000 --- a/ui/resources/default_100_percent/ash/window_shadow_active_top.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/window_shadow_active_top_left.png b/ui/resources/default_100_percent/ash/window_shadow_active_top_left.png Binary files differdeleted file mode 100644 index f9513873..0000000 --- a/ui/resources/default_100_percent/ash/window_shadow_active_top_left.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/window_shadow_active_top_right.png b/ui/resources/default_100_percent/ash/window_shadow_active_top_right.png Binary files differdeleted file mode 100644 index 687dca7..0000000 --- a/ui/resources/default_100_percent/ash/window_shadow_active_top_right.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/window_shadow_inactive_bottom.png b/ui/resources/default_100_percent/ash/window_shadow_inactive_bottom.png Binary files differdeleted file mode 100644 index 88d3d7d..0000000 --- a/ui/resources/default_100_percent/ash/window_shadow_inactive_bottom.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/window_shadow_inactive_bottom_left.png b/ui/resources/default_100_percent/ash/window_shadow_inactive_bottom_left.png Binary files differdeleted file mode 100644 index c0f5b63..0000000 --- a/ui/resources/default_100_percent/ash/window_shadow_inactive_bottom_left.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/window_shadow_inactive_bottom_right.png b/ui/resources/default_100_percent/ash/window_shadow_inactive_bottom_right.png Binary files differdeleted file mode 100644 index 60f1a49..0000000 --- a/ui/resources/default_100_percent/ash/window_shadow_inactive_bottom_right.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/window_shadow_inactive_left.png b/ui/resources/default_100_percent/ash/window_shadow_inactive_left.png Binary files differdeleted file mode 100644 index 56b1a5d..0000000 --- a/ui/resources/default_100_percent/ash/window_shadow_inactive_left.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/window_shadow_inactive_right.png b/ui/resources/default_100_percent/ash/window_shadow_inactive_right.png Binary files differdeleted file mode 100644 index 20ad740..0000000 --- a/ui/resources/default_100_percent/ash/window_shadow_inactive_right.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/window_shadow_inactive_top.png b/ui/resources/default_100_percent/ash/window_shadow_inactive_top.png Binary files differdeleted file mode 100644 index f643d82..0000000 --- a/ui/resources/default_100_percent/ash/window_shadow_inactive_top.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/window_shadow_inactive_top_left.png b/ui/resources/default_100_percent/ash/window_shadow_inactive_top_left.png Binary files differdeleted file mode 100644 index 3386052..0000000 --- a/ui/resources/default_100_percent/ash/window_shadow_inactive_top_left.png +++ /dev/null diff --git a/ui/resources/default_100_percent/ash/window_shadow_inactive_top_right.png b/ui/resources/default_100_percent/ash/window_shadow_inactive_top_right.png Binary files differdeleted file mode 100644 index b614bbd..0000000 --- a/ui/resources/default_100_percent/ash/window_shadow_inactive_top_right.png +++ /dev/null diff --git a/ui/resources/default_100_percent/aura/PRESUBMIT.py b/ui/resources/default_100_percent/aura/PRESUBMIT.py deleted file mode 100644 index 604f08c..0000000 --- a/ui/resources/default_100_percent/aura/PRESUBMIT.py +++ /dev/null @@ -1,12 +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. - -"""Chromium presubmit script for src/ui/resources/default_100_percent/aura/. - -See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts -for more details on the presubmit API built into gcl. -""" - -def GetPreferredTrySlaves(): - return ['linux_chromeos', 'win_aura'] diff --git a/ui/resources/default_100_percent/aura/chromium-32.png b/ui/resources/default_100_percent/aura/chromium-32.png Binary files differdeleted file mode 100644 index 5e3adba..0000000 --- a/ui/resources/default_100_percent/aura/chromium-32.png +++ /dev/null diff --git a/ui/resources/default_100_percent/aura/context_menu.png b/ui/resources/default_100_percent/aura/context_menu.png Binary files differdeleted file mode 100644 index 67ed5ec..0000000 --- a/ui/resources/default_100_percent/aura/context_menu.png +++ /dev/null diff --git a/ui/resources/default_100_percent/aura/window_button_separator.png b/ui/resources/default_100_percent/aura/window_button_separator.png Binary files differdeleted file mode 100644 index 2479798..0000000 --- a/ui/resources/default_100_percent/aura/window_button_separator.png +++ /dev/null diff --git a/ui/resources/default_100_percent/aura/window_close_hover.png b/ui/resources/default_100_percent/aura/window_close_hover.png Binary files differdeleted file mode 100644 index 4d446d0..0000000 --- a/ui/resources/default_100_percent/aura/window_close_hover.png +++ /dev/null diff --git a/ui/resources/default_100_percent/aura/window_close_normal.png b/ui/resources/default_100_percent/aura/window_close_normal.png Binary files differdeleted file mode 100644 index 1502053..0000000 --- a/ui/resources/default_100_percent/aura/window_close_normal.png +++ /dev/null diff --git a/ui/resources/default_100_percent/aura/window_close_pressed.png b/ui/resources/default_100_percent/aura/window_close_pressed.png Binary files differdeleted file mode 100644 index 9532a11..0000000 --- a/ui/resources/default_100_percent/aura/window_close_pressed.png +++ /dev/null diff --git a/ui/resources/default_100_percent/aura/window_fullscreen_shadow.png b/ui/resources/default_100_percent/aura/window_fullscreen_shadow.png Binary files differdeleted file mode 100644 index 707baa9..0000000 --- a/ui/resources/default_100_percent/aura/window_fullscreen_shadow.png +++ /dev/null diff --git a/ui/resources/default_100_percent/aura/window_header_base_active.png b/ui/resources/default_100_percent/aura/window_header_base_active.png Binary files differdeleted file mode 100644 index e5a27b1..0000000 --- a/ui/resources/default_100_percent/aura/window_header_base_active.png +++ /dev/null diff --git a/ui/resources/default_100_percent/aura/window_header_base_inactive.png b/ui/resources/default_100_percent/aura/window_header_base_inactive.png Binary files differdeleted file mode 100644 index e5a27b1..0000000 --- a/ui/resources/default_100_percent/aura/window_header_base_inactive.png +++ /dev/null diff --git a/ui/resources/default_100_percent/aura/window_header_base_incognito_active.png b/ui/resources/default_100_percent/aura/window_header_base_incognito_active.png Binary files differdeleted file mode 100644 index 17a884b..0000000 --- a/ui/resources/default_100_percent/aura/window_header_base_incognito_active.png +++ /dev/null diff --git a/ui/resources/default_100_percent/aura/window_header_base_incognito_inactive.png b/ui/resources/default_100_percent/aura/window_header_base_incognito_inactive.png Binary files differdeleted file mode 100644 index 1cf6366..0000000 --- a/ui/resources/default_100_percent/aura/window_header_base_incognito_inactive.png +++ /dev/null diff --git a/ui/resources/default_100_percent/aura/window_header_shade_bottom.png b/ui/resources/default_100_percent/aura/window_header_shade_bottom.png Binary files differdeleted file mode 100644 index 291352a..0000000 --- a/ui/resources/default_100_percent/aura/window_header_shade_bottom.png +++ /dev/null diff --git a/ui/resources/default_100_percent/aura/window_header_shade_bottom_left.png b/ui/resources/default_100_percent/aura/window_header_shade_bottom_left.png Binary files differdeleted file mode 100644 index b6166d2..0000000 --- a/ui/resources/default_100_percent/aura/window_header_shade_bottom_left.png +++ /dev/null diff --git a/ui/resources/default_100_percent/aura/window_header_shade_bottom_right.png b/ui/resources/default_100_percent/aura/window_header_shade_bottom_right.png Binary files differdeleted file mode 100644 index 5d0c566..0000000 --- a/ui/resources/default_100_percent/aura/window_header_shade_bottom_right.png +++ /dev/null diff --git a/ui/resources/default_100_percent/aura/window_header_shade_left.png b/ui/resources/default_100_percent/aura/window_header_shade_left.png Binary files differdeleted file mode 100644 index 5816ab7..0000000 --- a/ui/resources/default_100_percent/aura/window_header_shade_left.png +++ /dev/null diff --git a/ui/resources/default_100_percent/aura/window_header_shade_middle.png b/ui/resources/default_100_percent/aura/window_header_shade_middle.png Binary files differdeleted file mode 100644 index a72c6bae..0000000 --- a/ui/resources/default_100_percent/aura/window_header_shade_middle.png +++ /dev/null diff --git a/ui/resources/default_100_percent/aura/window_header_shade_right.png b/ui/resources/default_100_percent/aura/window_header_shade_right.png Binary files differdeleted file mode 100644 index 660f948..0000000 --- a/ui/resources/default_100_percent/aura/window_header_shade_right.png +++ /dev/null diff --git a/ui/resources/default_100_percent/aura/window_header_shade_top.png b/ui/resources/default_100_percent/aura/window_header_shade_top.png Binary files differdeleted file mode 100644 index 0944dd8..0000000 --- a/ui/resources/default_100_percent/aura/window_header_shade_top.png +++ /dev/null diff --git a/ui/resources/default_100_percent/aura/window_header_shade_top_left.png b/ui/resources/default_100_percent/aura/window_header_shade_top_left.png Binary files differdeleted file mode 100644 index caf83d6..0000000 --- a/ui/resources/default_100_percent/aura/window_header_shade_top_left.png +++ /dev/null diff --git a/ui/resources/default_100_percent/aura/window_header_shade_top_right.png b/ui/resources/default_100_percent/aura/window_header_shade_top_right.png Binary files differdeleted file mode 100644 index 6ed8530..0000000 --- a/ui/resources/default_100_percent/aura/window_header_shade_top_right.png +++ /dev/null diff --git a/ui/resources/default_100_percent/aura/window_maximize_hover.png b/ui/resources/default_100_percent/aura/window_maximize_hover.png Binary files differdeleted file mode 100644 index 431e5f2..0000000 --- a/ui/resources/default_100_percent/aura/window_maximize_hover.png +++ /dev/null diff --git a/ui/resources/default_100_percent/aura/window_maximize_normal.png b/ui/resources/default_100_percent/aura/window_maximize_normal.png Binary files differdeleted file mode 100644 index 679cf5f..0000000 --- a/ui/resources/default_100_percent/aura/window_maximize_normal.png +++ /dev/null diff --git a/ui/resources/default_100_percent/aura/window_maximize_pressed.png b/ui/resources/default_100_percent/aura/window_maximize_pressed.png Binary files differdeleted file mode 100644 index 4eb4fe9..0000000 --- a/ui/resources/default_100_percent/aura/window_maximize_pressed.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/pointers/alias.png b/ui/resources/default_100_percent/cros/pointers/alias.png Binary files differdeleted file mode 100644 index 428f641..0000000 --- a/ui/resources/default_100_percent/cros/pointers/alias.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/pointers/cell.png b/ui/resources/default_100_percent/cros/pointers/cell.png Binary files differdeleted file mode 100644 index b21b6eb..0000000 --- a/ui/resources/default_100_percent/cros/pointers/cell.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/pointers/context_menu.png b/ui/resources/default_100_percent/cros/pointers/context_menu.png Binary files differdeleted file mode 100644 index a6b0e6e..0000000 --- a/ui/resources/default_100_percent/cros/pointers/context_menu.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/pointers/copy.png b/ui/resources/default_100_percent/cros/pointers/copy.png Binary files differdeleted file mode 100644 index 06bb7ce..0000000 --- a/ui/resources/default_100_percent/cros/pointers/copy.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/pointers/crosshair.png b/ui/resources/default_100_percent/cros/pointers/crosshair.png Binary files differdeleted file mode 100644 index cf2d49d..0000000 --- a/ui/resources/default_100_percent/cros/pointers/crosshair.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/pointers/fleur.png b/ui/resources/default_100_percent/cros/pointers/fleur.png Binary files differdeleted file mode 100644 index b5ba1fd..0000000 --- a/ui/resources/default_100_percent/cros/pointers/fleur.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/pointers/hand2.png b/ui/resources/default_100_percent/cros/pointers/hand2.png Binary files differdeleted file mode 100644 index 9b840b1..0000000 --- a/ui/resources/default_100_percent/cros/pointers/hand2.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/pointers/hand3.png b/ui/resources/default_100_percent/cros/pointers/hand3.png Binary files differdeleted file mode 100644 index 91cd6e8..0000000 --- a/ui/resources/default_100_percent/cros/pointers/hand3.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/pointers/help.png b/ui/resources/default_100_percent/cros/pointers/help.png Binary files differdeleted file mode 100644 index 69f9331..0000000 --- a/ui/resources/default_100_percent/cros/pointers/help.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/pointers/left_ptr.png b/ui/resources/default_100_percent/cros/pointers/left_ptr.png Binary files differdeleted file mode 100644 index 7753ae5..0000000 --- a/ui/resources/default_100_percent/cros/pointers/left_ptr.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/pointers/move.png b/ui/resources/default_100_percent/cros/pointers/move.png Binary files differdeleted file mode 100644 index 97340fc..0000000 --- a/ui/resources/default_100_percent/cros/pointers/move.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/pointers/nodrop.png b/ui/resources/default_100_percent/cros/pointers/nodrop.png Binary files differdeleted file mode 100644 index 9c58bf3..0000000 --- a/ui/resources/default_100_percent/cros/pointers/nodrop.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/pointers/sb_h_double_arrow.png b/ui/resources/default_100_percent/cros/pointers/sb_h_double_arrow.png Binary files differdeleted file mode 100644 index f421663..0000000 --- a/ui/resources/default_100_percent/cros/pointers/sb_h_double_arrow.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/pointers/sb_v_double_arrow.png b/ui/resources/default_100_percent/cros/pointers/sb_v_double_arrow.png Binary files differdeleted file mode 100644 index 8b8650e..0000000 --- a/ui/resources/default_100_percent/cros/pointers/sb_v_double_arrow.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/pointers/top_left_corner.png b/ui/resources/default_100_percent/cros/pointers/top_left_corner.png Binary files differdeleted file mode 100644 index 11194f0..0000000 --- a/ui/resources/default_100_percent/cros/pointers/top_left_corner.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/pointers/top_right_corner.png b/ui/resources/default_100_percent/cros/pointers/top_right_corner.png Binary files differdeleted file mode 100644 index d324583..0000000 --- a/ui/resources/default_100_percent/cros/pointers/top_right_corner.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/pointers/xterm.png b/ui/resources/default_100_percent/cros/pointers/xterm.png Binary files differdeleted file mode 100644 index 53536d7..0000000 --- a/ui/resources/default_100_percent/cros/pointers/xterm.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/pointers/xterm_horiz.png b/ui/resources/default_100_percent/cros/pointers/xterm_horiz.png Binary files differdeleted file mode 100644 index bdb762ec..0000000 --- a/ui/resources/default_100_percent/cros/pointers/xterm_horiz.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/pointers/zoom_in.png b/ui/resources/default_100_percent/cros/pointers/zoom_in.png Binary files differdeleted file mode 100644 index ea0c64c..0000000 --- a/ui/resources/default_100_percent/cros/pointers/zoom_in.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/pointers/zoom_out.png b/ui/resources/default_100_percent/cros/pointers/zoom_out.png Binary files differdeleted file mode 100644 index 79fdbd4..0000000 --- a/ui/resources/default_100_percent/cros/pointers/zoom_out.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/window_close_fullscreen_hover.png b/ui/resources/default_100_percent/cros/window_close_fullscreen_hover.png Binary files differdeleted file mode 100644 index 698caa7..0000000 --- a/ui/resources/default_100_percent/cros/window_close_fullscreen_hover.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/window_close_fullscreen_normal.png b/ui/resources/default_100_percent/cros/window_close_fullscreen_normal.png Binary files differdeleted file mode 100644 index 64c065f..0000000 --- a/ui/resources/default_100_percent/cros/window_close_fullscreen_normal.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/window_close_fullscreen_pressed.png b/ui/resources/default_100_percent/cros/window_close_fullscreen_pressed.png Binary files differdeleted file mode 100644 index d5c7d31..0000000 --- a/ui/resources/default_100_percent/cros/window_close_fullscreen_pressed.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/window_close_short_black_hover.png b/ui/resources/default_100_percent/cros/window_close_short_black_hover.png Binary files differdeleted file mode 100644 index 51a7506..0000000 --- a/ui/resources/default_100_percent/cros/window_close_short_black_hover.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/window_close_short_black_normal.png b/ui/resources/default_100_percent/cros/window_close_short_black_normal.png Binary files differdeleted file mode 100644 index 91d6cfc..0000000 --- a/ui/resources/default_100_percent/cros/window_close_short_black_normal.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/window_close_short_black_pressed.png b/ui/resources/default_100_percent/cros/window_close_short_black_pressed.png Binary files differdeleted file mode 100644 index 49f214b..0000000 --- a/ui/resources/default_100_percent/cros/window_close_short_black_pressed.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/window_close_short_hover.png b/ui/resources/default_100_percent/cros/window_close_short_hover.png Binary files differdeleted file mode 100644 index d3d4fa3..0000000 --- a/ui/resources/default_100_percent/cros/window_close_short_hover.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/window_close_short_normal.png b/ui/resources/default_100_percent/cros/window_close_short_normal.png Binary files differdeleted file mode 100644 index daece6c..0000000 --- a/ui/resources/default_100_percent/cros/window_close_short_normal.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/window_close_short_pressed.png b/ui/resources/default_100_percent/cros/window_close_short_pressed.png Binary files differdeleted file mode 100644 index e2f9033..0000000 --- a/ui/resources/default_100_percent/cros/window_close_short_pressed.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/window_close_tall_hover.png b/ui/resources/default_100_percent/cros/window_close_tall_hover.png Binary files differdeleted file mode 100644 index e044da5..0000000 --- a/ui/resources/default_100_percent/cros/window_close_tall_hover.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/window_close_tall_normal.png b/ui/resources/default_100_percent/cros/window_close_tall_normal.png Binary files differdeleted file mode 100644 index d196567..0000000 --- a/ui/resources/default_100_percent/cros/window_close_tall_normal.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/window_close_tall_pressed.png b/ui/resources/default_100_percent/cros/window_close_tall_pressed.png Binary files differdeleted file mode 100644 index 52391cc..0000000 --- a/ui/resources/default_100_percent/cros/window_close_tall_pressed.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/window_position_left_hover.png b/ui/resources/default_100_percent/cros/window_position_left_hover.png Binary files differdeleted file mode 100644 index df57934b..0000000 --- a/ui/resources/default_100_percent/cros/window_position_left_hover.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/window_position_left_hover_restore.png b/ui/resources/default_100_percent/cros/window_position_left_hover_restore.png Binary files differdeleted file mode 100644 index 8c4e1d7..0000000 --- a/ui/resources/default_100_percent/cros/window_position_left_hover_restore.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/window_position_left_normal.png b/ui/resources/default_100_percent/cros/window_position_left_normal.png Binary files differdeleted file mode 100644 index f30d95b..0000000 --- a/ui/resources/default_100_percent/cros/window_position_left_normal.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/window_position_left_normal_restore.png b/ui/resources/default_100_percent/cros/window_position_left_normal_restore.png Binary files differdeleted file mode 100644 index 0548812..0000000 --- a/ui/resources/default_100_percent/cros/window_position_left_normal_restore.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/window_position_left_pressed.png b/ui/resources/default_100_percent/cros/window_position_left_pressed.png Binary files differdeleted file mode 100644 index 88908e0..0000000 --- a/ui/resources/default_100_percent/cros/window_position_left_pressed.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/window_position_left_pressed_restore.png b/ui/resources/default_100_percent/cros/window_position_left_pressed_restore.png Binary files differdeleted file mode 100644 index 82714c6..0000000 --- a/ui/resources/default_100_percent/cros/window_position_left_pressed_restore.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/window_position_middle_hover.png b/ui/resources/default_100_percent/cros/window_position_middle_hover.png Binary files differdeleted file mode 100644 index ccf4d5b..0000000 --- a/ui/resources/default_100_percent/cros/window_position_middle_hover.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/window_position_middle_normal.png b/ui/resources/default_100_percent/cros/window_position_middle_normal.png Binary files differdeleted file mode 100644 index 88d43d1..0000000 --- a/ui/resources/default_100_percent/cros/window_position_middle_normal.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/window_position_middle_pressed.png b/ui/resources/default_100_percent/cros/window_position_middle_pressed.png Binary files differdeleted file mode 100644 index 9f4f551..0000000 --- a/ui/resources/default_100_percent/cros/window_position_middle_pressed.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/window_position_right_hover.png b/ui/resources/default_100_percent/cros/window_position_right_hover.png Binary files differdeleted file mode 100644 index b162f5e..0000000 --- a/ui/resources/default_100_percent/cros/window_position_right_hover.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/window_position_right_hover_restore.png b/ui/resources/default_100_percent/cros/window_position_right_hover_restore.png Binary files differdeleted file mode 100644 index 7c98e8c..0000000 --- a/ui/resources/default_100_percent/cros/window_position_right_hover_restore.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/window_position_right_normal.png b/ui/resources/default_100_percent/cros/window_position_right_normal.png Binary files differdeleted file mode 100644 index 5946c78..0000000 --- a/ui/resources/default_100_percent/cros/window_position_right_normal.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/window_position_right_normal_restore.png b/ui/resources/default_100_percent/cros/window_position_right_normal_restore.png Binary files differdeleted file mode 100644 index 26753f1..0000000 --- a/ui/resources/default_100_percent/cros/window_position_right_normal_restore.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/window_position_right_pressed.png b/ui/resources/default_100_percent/cros/window_position_right_pressed.png Binary files differdeleted file mode 100644 index 6398d8b..0000000 --- a/ui/resources/default_100_percent/cros/window_position_right_pressed.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/window_position_right_pressed_restore.png b/ui/resources/default_100_percent/cros/window_position_right_pressed_restore.png Binary files differdeleted file mode 100644 index 49d8eee..0000000 --- a/ui/resources/default_100_percent/cros/window_position_right_pressed_restore.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/window_size_fullscreen_hover.png b/ui/resources/default_100_percent/cros/window_size_fullscreen_hover.png Binary files differdeleted file mode 100644 index efe5fb8..0000000 --- a/ui/resources/default_100_percent/cros/window_size_fullscreen_hover.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/window_size_fullscreen_normal.png b/ui/resources/default_100_percent/cros/window_size_fullscreen_normal.png Binary files differdeleted file mode 100644 index 85728e1..0000000 --- a/ui/resources/default_100_percent/cros/window_size_fullscreen_normal.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/window_size_fullscreen_pressed.png b/ui/resources/default_100_percent/cros/window_size_fullscreen_pressed.png Binary files differdeleted file mode 100644 index f201772b2..0000000 --- a/ui/resources/default_100_percent/cros/window_size_fullscreen_pressed.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/window_size_short_black_hover.png b/ui/resources/default_100_percent/cros/window_size_short_black_hover.png Binary files differdeleted file mode 100644 index ea238bd..0000000 --- a/ui/resources/default_100_percent/cros/window_size_short_black_hover.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/window_size_short_black_normal.png b/ui/resources/default_100_percent/cros/window_size_short_black_normal.png Binary files differdeleted file mode 100644 index 477b933..0000000 --- a/ui/resources/default_100_percent/cros/window_size_short_black_normal.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/window_size_short_black_pressed.png b/ui/resources/default_100_percent/cros/window_size_short_black_pressed.png Binary files differdeleted file mode 100644 index bf93d92..0000000 --- a/ui/resources/default_100_percent/cros/window_size_short_black_pressed.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/window_size_short_hover.png b/ui/resources/default_100_percent/cros/window_size_short_hover.png Binary files differdeleted file mode 100644 index 23ee68c..0000000 --- a/ui/resources/default_100_percent/cros/window_size_short_hover.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/window_size_short_normal.png b/ui/resources/default_100_percent/cros/window_size_short_normal.png Binary files differdeleted file mode 100644 index ae1a3cb..0000000 --- a/ui/resources/default_100_percent/cros/window_size_short_normal.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/window_size_short_pressed.png b/ui/resources/default_100_percent/cros/window_size_short_pressed.png Binary files differdeleted file mode 100644 index 8204149..0000000 --- a/ui/resources/default_100_percent/cros/window_size_short_pressed.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/window_size_tall_hover.png b/ui/resources/default_100_percent/cros/window_size_tall_hover.png Binary files differdeleted file mode 100644 index 008c2db..0000000 --- a/ui/resources/default_100_percent/cros/window_size_tall_hover.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/window_size_tall_normal.png b/ui/resources/default_100_percent/cros/window_size_tall_normal.png Binary files differdeleted file mode 100644 index c599691..0000000 --- a/ui/resources/default_100_percent/cros/window_size_tall_normal.png +++ /dev/null diff --git a/ui/resources/default_100_percent/cros/window_size_tall_pressed.png b/ui/resources/default_100_percent/cros/window_size_tall_pressed.png Binary files differdeleted file mode 100644 index 1b0b322..0000000 --- a/ui/resources/default_100_percent/cros/window_size_tall_pressed.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/PRESUBMIT.py b/ui/resources/default_200_percent/ash/PRESUBMIT.py deleted file mode 100644 index 3ab76c6..0000000 --- a/ui/resources/default_200_percent/ash/PRESUBMIT.py +++ /dev/null @@ -1,12 +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. - -"""Chromium presubmit script for src/ui/resources/default_200_percent/ash/. - -See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts -for more details on the presubmit API built into gcl. -""" - -def GetPreferredTrySlaves(): - return ['linux_chromeos', 'win_aura'] diff --git a/ui/resources/default_200_percent/ash/launcher_background.png b/ui/resources/default_200_percent/ash/launcher_background.png Binary files differdeleted file mode 100644 index 02d8a2d..0000000 --- a/ui/resources/default_200_percent/ash/launcher_background.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/launcher_browser.png b/ui/resources/default_200_percent/ash/launcher_browser.png Binary files differdeleted file mode 100644 index 1a62e18..0000000 --- a/ui/resources/default_200_percent/ash/launcher_browser.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/launcher_browser_panel.png b/ui/resources/default_200_percent/ash/launcher_browser_panel.png Binary files differdeleted file mode 100644 index 76af76b..0000000 --- a/ui/resources/default_200_percent/ash/launcher_browser_panel.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/launcher_dimming.png b/ui/resources/default_200_percent/ash/launcher_dimming.png Binary files differdeleted file mode 100644 index 12ca313..0000000 --- a/ui/resources/default_200_percent/ash/launcher_dimming.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/launcher_incognito_browser.png b/ui/resources/default_200_percent/ash/launcher_incognito_browser.png Binary files differdeleted file mode 100644 index a8ade13..0000000 --- a/ui/resources/default_200_percent/ash/launcher_incognito_browser.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/launcher_incognito_browser_panel.png b/ui/resources/default_200_percent/ash/launcher_incognito_browser_panel.png Binary files differdeleted file mode 100644 index eb33138..0000000 --- a/ui/resources/default_200_percent/ash/launcher_incognito_browser_panel.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/launcher_overflow.png b/ui/resources/default_200_percent/ash/launcher_overflow.png Binary files differdeleted file mode 100644 index f15d6f1..0000000 --- a/ui/resources/default_200_percent/ash/launcher_overflow.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/launcher_underline_active.png b/ui/resources/default_200_percent/ash/launcher_underline_active.png Binary files differdeleted file mode 100644 index 1b5c58a..0000000 --- a/ui/resources/default_200_percent/ash/launcher_underline_active.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/launcher_underline_hover.png b/ui/resources/default_200_percent/ash/launcher_underline_hover.png Binary files differdeleted file mode 100644 index a464a8e..0000000 --- a/ui/resources/default_200_percent/ash/launcher_underline_hover.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/launcher_underline_running.png b/ui/resources/default_200_percent/ash/launcher_underline_running.png Binary files differdeleted file mode 100644 index fd1fe0f..0000000 --- a/ui/resources/default_200_percent/ash/launcher_underline_running.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/notification_button_active_hover.png b/ui/resources/default_200_percent/ash/notification_button_active_hover.png Binary files differdeleted file mode 100644 index c53f880..0000000 --- a/ui/resources/default_200_percent/ash/notification_button_active_hover.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/notification_button_active_normal.png b/ui/resources/default_200_percent/ash/notification_button_active_normal.png Binary files differdeleted file mode 100644 index 9cf4907..0000000 --- a/ui/resources/default_200_percent/ash/notification_button_active_normal.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/notification_button_active_pressed.png b/ui/resources/default_200_percent/ash/notification_button_active_pressed.png Binary files differdeleted file mode 100644 index 69cacb1..0000000 --- a/ui/resources/default_200_percent/ash/notification_button_active_pressed.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/notification_button_inactive_hover.png b/ui/resources/default_200_percent/ash/notification_button_inactive_hover.png Binary files differdeleted file mode 100644 index 6dcc39d..0000000 --- a/ui/resources/default_200_percent/ash/notification_button_inactive_hover.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/notification_button_inactive_normal.png b/ui/resources/default_200_percent/ash/notification_button_inactive_normal.png Binary files differdeleted file mode 100644 index 6d8da5c..0000000 --- a/ui/resources/default_200_percent/ash/notification_button_inactive_normal.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/notification_button_inactive_pressed.png b/ui/resources/default_200_percent/ash/notification_button_inactive_pressed.png Binary files differdeleted file mode 100644 index 7c2d6c1..0000000 --- a/ui/resources/default_200_percent/ash/notification_button_inactive_pressed.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/small_shadow_bottom.png b/ui/resources/default_200_percent/ash/small_shadow_bottom.png Binary files differdeleted file mode 100644 index 94534bf..0000000 --- a/ui/resources/default_200_percent/ash/small_shadow_bottom.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/small_shadow_bottom_left.png b/ui/resources/default_200_percent/ash/small_shadow_bottom_left.png Binary files differdeleted file mode 100644 index e8dfb63..0000000 --- a/ui/resources/default_200_percent/ash/small_shadow_bottom_left.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/small_shadow_bottom_right.png b/ui/resources/default_200_percent/ash/small_shadow_bottom_right.png Binary files differdeleted file mode 100644 index fb52827..0000000 --- a/ui/resources/default_200_percent/ash/small_shadow_bottom_right.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/small_shadow_left.png b/ui/resources/default_200_percent/ash/small_shadow_left.png Binary files differdeleted file mode 100644 index f89aa1a..0000000 --- a/ui/resources/default_200_percent/ash/small_shadow_left.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/small_shadow_right.png b/ui/resources/default_200_percent/ash/small_shadow_right.png Binary files differdeleted file mode 100644 index bc1a5d1..0000000 --- a/ui/resources/default_200_percent/ash/small_shadow_right.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/small_shadow_top.png b/ui/resources/default_200_percent/ash/small_shadow_top.png Binary files differdeleted file mode 100644 index 9aa60c2..0000000 --- a/ui/resources/default_200_percent/ash/small_shadow_top.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/small_shadow_top_left.png b/ui/resources/default_200_percent/ash/small_shadow_top_left.png Binary files differdeleted file mode 100644 index a43689b..0000000 --- a/ui/resources/default_200_percent/ash/small_shadow_top_left.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/small_shadow_top_right.png b/ui/resources/default_200_percent/ash/small_shadow_top_right.png Binary files differdeleted file mode 100644 index 923b715..0000000 --- a/ui/resources/default_200_percent/ash/small_shadow_top_right.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_accessibility_dark.png b/ui/resources/default_200_percent/ash/status_accessibility_dark.png Binary files differdeleted file mode 100644 index 44da10e..0000000 --- a/ui/resources/default_200_percent/ash/status_accessibility_dark.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_bluetooth.png b/ui/resources/default_200_percent/ash/status_bluetooth.png Binary files differdeleted file mode 100644 index 3af6c75..0000000 --- a/ui/resources/default_200_percent/ash/status_bluetooth.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_bluetooth_disabled.png b/ui/resources/default_200_percent/ash/status_bluetooth_disabled.png Binary files differdeleted file mode 100644 index 82e3f4f..0000000 --- a/ui/resources/default_200_percent/ash/status_bluetooth_disabled.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_bluetooth_disabled_h.png b/ui/resources/default_200_percent/ash/status_bluetooth_disabled_h.png Binary files differdeleted file mode 100644 index 4772106..0000000 --- a/ui/resources/default_200_percent/ash/status_bluetooth_disabled_h.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_bluetooth_enabled.png b/ui/resources/default_200_percent/ash/status_bluetooth_enabled.png Binary files differdeleted file mode 100644 index 3ecfe2d..0000000 --- a/ui/resources/default_200_percent/ash/status_bluetooth_enabled.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_bluetooth_enabled_h.png b/ui/resources/default_200_percent/ash/status_bluetooth_enabled_h.png Binary files differdeleted file mode 100644 index ea3efbc..0000000 --- a/ui/resources/default_200_percent/ash/status_bluetooth_enabled_h.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_brightness.png b/ui/resources/default_200_percent/ash/status_brightness.png Binary files differdeleted file mode 100644 index 092129f..0000000 --- a/ui/resources/default_200_percent/ash/status_brightness.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_capslock.png b/ui/resources/default_200_percent/ash/status_capslock.png Binary files differdeleted file mode 100644 index 2320b5f..0000000 --- a/ui/resources/default_200_percent/ash/status_capslock.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_capslock_dark.png b/ui/resources/default_200_percent/ash/status_capslock_dark.png Binary files differdeleted file mode 100644 index 1d16bf9..0000000 --- a/ui/resources/default_200_percent/ash/status_capslock_dark.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_cellular_disabled.png b/ui/resources/default_200_percent/ash/status_cellular_disabled.png Binary files differdeleted file mode 100644 index d637c8c..0000000 --- a/ui/resources/default_200_percent/ash/status_cellular_disabled.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_cellular_disabled_h.png b/ui/resources/default_200_percent/ash/status_cellular_disabled_h.png Binary files differdeleted file mode 100644 index a49b4c3..0000000 --- a/ui/resources/default_200_percent/ash/status_cellular_disabled_h.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_cellular_enabled.png b/ui/resources/default_200_percent/ash/status_cellular_enabled.png Binary files differdeleted file mode 100644 index dce3376..0000000 --- a/ui/resources/default_200_percent/ash/status_cellular_enabled.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_cellular_enabled_h.png b/ui/resources/default_200_percent/ash/status_cellular_enabled_h.png Binary files differdeleted file mode 100644 index fced2bd..0000000 --- a/ui/resources/default_200_percent/ash/status_cellular_enabled_h.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_data_low.png b/ui/resources/default_200_percent/ash/status_data_low.png Binary files differdeleted file mode 100644 index 8e395af..0000000 --- a/ui/resources/default_200_percent/ash/status_data_low.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_data_none.png b/ui/resources/default_200_percent/ash/status_data_none.png Binary files differdeleted file mode 100644 index 6b17c90..0000000 --- a/ui/resources/default_200_percent/ash/status_data_none.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_display.png b/ui/resources/default_200_percent/ash/status_display.png Binary files differdeleted file mode 100644 index ca4325145..0000000 --- a/ui/resources/default_200_percent/ash/status_display.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_display_hover.png b/ui/resources/default_200_percent/ash/status_display_hover.png Binary files differdeleted file mode 100644 index 01bb79f..0000000 --- a/ui/resources/default_200_percent/ash/status_display_hover.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_display_pressed.png b/ui/resources/default_200_percent/ash/status_display_pressed.png Binary files differdeleted file mode 100644 index c00cf8b..0000000 --- a/ui/resources/default_200_percent/ash/status_display_pressed.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_drive.png b/ui/resources/default_200_percent/ash/status_drive.png Binary files differdeleted file mode 100644 index a6f783c..0000000 --- a/ui/resources/default_200_percent/ash/status_drive.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_drive_item_cancel.png b/ui/resources/default_200_percent/ash/status_drive_item_cancel.png Binary files differdeleted file mode 100644 index 7607820..0000000 --- a/ui/resources/default_200_percent/ash/status_drive_item_cancel.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_drive_item_cancel_hover.png b/ui/resources/default_200_percent/ash/status_drive_item_cancel_hover.png Binary files differdeleted file mode 100644 index c3eb97d..0000000 --- a/ui/resources/default_200_percent/ash/status_drive_item_cancel_hover.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_drive_item_done.png b/ui/resources/default_200_percent/ash/status_drive_item_done.png Binary files differdeleted file mode 100644 index c6a7cd3..0000000 --- a/ui/resources/default_200_percent/ash/status_drive_item_done.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_drive_item_failed.png b/ui/resources/default_200_percent/ash/status_drive_item_failed.png Binary files differdeleted file mode 100644 index e964eb4..0000000 --- a/ui/resources/default_200_percent/ash/status_drive_item_failed.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_drive_light.png b/ui/resources/default_200_percent/ash/status_drive_light.png Binary files differdeleted file mode 100644 index be0d2f3..0000000 --- a/ui/resources/default_200_percent/ash/status_drive_light.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_help.png b/ui/resources/default_200_percent/ash/status_help.png Binary files differdeleted file mode 100644 index 8630e7e..0000000 --- a/ui/resources/default_200_percent/ash/status_help.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_help_h.png b/ui/resources/default_200_percent/ash/status_help_h.png Binary files differdeleted file mode 100644 index f441e8f..0000000 --- a/ui/resources/default_200_percent/ash/status_help_h.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_ime.png b/ui/resources/default_200_percent/ash/status_ime.png Binary files differdeleted file mode 100644 index 36a3f8e..0000000 --- a/ui/resources/default_200_percent/ash/status_ime.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_less.png b/ui/resources/default_200_percent/ash/status_less.png Binary files differdeleted file mode 100644 index 83431c7..0000000 --- a/ui/resources/default_200_percent/ash/status_less.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_locale.png b/ui/resources/default_200_percent/ash/status_locale.png Binary files differdeleted file mode 100644 index f3a5489..0000000 --- a/ui/resources/default_200_percent/ash/status_locale.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_lockscreen.png b/ui/resources/default_200_percent/ash/status_lockscreen.png Binary files differdeleted file mode 100644 index 1270ce4..0000000 --- a/ui/resources/default_200_percent/ash/status_lockscreen.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_lockscreen_h.png b/ui/resources/default_200_percent/ash/status_lockscreen_h.png Binary files differdeleted file mode 100644 index 269221a..0000000 --- a/ui/resources/default_200_percent/ash/status_lockscreen_h.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_more.png b/ui/resources/default_200_percent/ash/status_more.png Binary files differdeleted file mode 100644 index 086b8cd..0000000 --- a/ui/resources/default_200_percent/ash/status_more.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_network_failed.png b/ui/resources/default_200_percent/ash/status_network_failed.png Binary files differdeleted file mode 100644 index a4bb3a5..0000000 --- a/ui/resources/default_200_percent/ash/status_network_failed.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_network_info.png b/ui/resources/default_200_percent/ash/status_network_info.png Binary files differdeleted file mode 100644 index fe73e08..0000000 --- a/ui/resources/default_200_percent/ash/status_network_info.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_network_info_h.png b/ui/resources/default_200_percent/ash/status_network_info_h.png Binary files differdeleted file mode 100644 index 37f7db4..0000000 --- a/ui/resources/default_200_percent/ash/status_network_info_h.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_notify_x.png b/ui/resources/default_200_percent/ash/status_notify_x.png Binary files differdeleted file mode 100644 index e1029b7..0000000 --- a/ui/resources/default_200_percent/ash/status_notify_x.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_power_small_all.png b/ui/resources/default_200_percent/ash/status_power_small_all.png Binary files differdeleted file mode 100644 index 46af5ae..0000000 --- a/ui/resources/default_200_percent/ash/status_power_small_all.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_power_small_all_dark.png b/ui/resources/default_200_percent/ash/status_power_small_all_dark.png Binary files differdeleted file mode 100644 index 78e2310..0000000 --- a/ui/resources/default_200_percent/ash/status_power_small_all_dark.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_settings.png b/ui/resources/default_200_percent/ash/status_settings.png Binary files differdeleted file mode 100644 index 754a3df..0000000 --- a/ui/resources/default_200_percent/ash/status_settings.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_shutdown.png b/ui/resources/default_200_percent/ash/status_shutdown.png Binary files differdeleted file mode 100644 index 0199c03..0000000 --- a/ui/resources/default_200_percent/ash/status_shutdown.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_shutdown_h.png b/ui/resources/default_200_percent/ash/status_shutdown_h.png Binary files differdeleted file mode 100644 index 671c649..0000000 --- a/ui/resources/default_200_percent/ash/status_shutdown_h.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_sms.png b/ui/resources/default_200_percent/ash/status_sms.png Binary files differdeleted file mode 100644 index 7dcbec6..0000000 --- a/ui/resources/default_200_percent/ash/status_sms.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_update.png b/ui/resources/default_200_percent/ash/status_update.png Binary files differdeleted file mode 100644 index 537c5f7..0000000 --- a/ui/resources/default_200_percent/ash/status_update.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_update_dark.png b/ui/resources/default_200_percent/ash/status_update_dark.png Binary files differdeleted file mode 100644 index 610f1ce..0000000 --- a/ui/resources/default_200_percent/ash/status_update_dark.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_update_dark_green.png b/ui/resources/default_200_percent/ash/status_update_dark_green.png Binary files differdeleted file mode 100644 index fce15c7..0000000 --- a/ui/resources/default_200_percent/ash/status_update_dark_green.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_update_dark_orange.png b/ui/resources/default_200_percent/ash/status_update_dark_orange.png Binary files differdeleted file mode 100644 index db01e5d..0000000 --- a/ui/resources/default_200_percent/ash/status_update_dark_orange.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_update_dark_red.png b/ui/resources/default_200_percent/ash/status_update_dark_red.png Binary files differdeleted file mode 100644 index 3dfc8c4..0000000 --- a/ui/resources/default_200_percent/ash/status_update_dark_red.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_update_green.png b/ui/resources/default_200_percent/ash/status_update_green.png Binary files differdeleted file mode 100644 index 3f08d81..0000000 --- a/ui/resources/default_200_percent/ash/status_update_green.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_update_orange.png b/ui/resources/default_200_percent/ash/status_update_orange.png Binary files differdeleted file mode 100644 index c233c78..0000000 --- a/ui/resources/default_200_percent/ash/status_update_orange.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_update_red.png b/ui/resources/default_200_percent/ash/status_update_red.png Binary files differdeleted file mode 100644 index 9dc5c04..0000000 --- a/ui/resources/default_200_percent/ash/status_update_red.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_volume_dark.png b/ui/resources/default_200_percent/ash/status_volume_dark.png Binary files differdeleted file mode 100644 index 170ae2c..0000000 --- a/ui/resources/default_200_percent/ash/status_volume_dark.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_volume_mute.png b/ui/resources/default_200_percent/ash/status_volume_mute.png Binary files differdeleted file mode 100644 index ac1f83b..0000000 --- a/ui/resources/default_200_percent/ash/status_volume_mute.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_wifi_disabled.png b/ui/resources/default_200_percent/ash/status_wifi_disabled.png Binary files differdeleted file mode 100644 index af59e72..0000000 --- a/ui/resources/default_200_percent/ash/status_wifi_disabled.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_wifi_disabled_h.png b/ui/resources/default_200_percent/ash/status_wifi_disabled_h.png Binary files differdeleted file mode 100644 index 481b623..0000000 --- a/ui/resources/default_200_percent/ash/status_wifi_disabled_h.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_wifi_enabled.png b/ui/resources/default_200_percent/ash/status_wifi_enabled.png Binary files differdeleted file mode 100644 index 4840180..0000000 --- a/ui/resources/default_200_percent/ash/status_wifi_enabled.png +++ /dev/null diff --git a/ui/resources/default_200_percent/ash/status_wifi_enabled_h.png b/ui/resources/default_200_percent/ash/status_wifi_enabled_h.png Binary files differdeleted file mode 100644 index 3ffca69..0000000 --- a/ui/resources/default_200_percent/ash/status_wifi_enabled_h.png +++ /dev/null diff --git a/ui/resources/default_200_percent/aura/PRESUBMIT.py b/ui/resources/default_200_percent/aura/PRESUBMIT.py deleted file mode 100644 index b9b7807..0000000 --- a/ui/resources/default_200_percent/aura/PRESUBMIT.py +++ /dev/null @@ -1,12 +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. - -"""Chromium presubmit script for src/ui/resources/default_200_percent/aura/. - -See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts -for more details on the presubmit API built into gcl. -""" - -def GetPreferredTrySlaves(): - return ['linux_chromeos', 'win_aura'] diff --git a/ui/resources/default_200_percent/aura/context_menu.png b/ui/resources/default_200_percent/aura/context_menu.png Binary files differdeleted file mode 100644 index e9815e4..0000000 --- a/ui/resources/default_200_percent/aura/context_menu.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/pointers/alias.png b/ui/resources/default_200_percent/cros/pointers/alias.png Binary files differdeleted file mode 100644 index f9b21a9..0000000 --- a/ui/resources/default_200_percent/cros/pointers/alias.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/pointers/cell.png b/ui/resources/default_200_percent/cros/pointers/cell.png Binary files differdeleted file mode 100644 index e487040..0000000 --- a/ui/resources/default_200_percent/cros/pointers/cell.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/pointers/context_menu.png b/ui/resources/default_200_percent/cros/pointers/context_menu.png Binary files differdeleted file mode 100644 index b74bcc1..0000000 --- a/ui/resources/default_200_percent/cros/pointers/context_menu.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/pointers/copy.png b/ui/resources/default_200_percent/cros/pointers/copy.png Binary files differdeleted file mode 100644 index b0601c9..0000000 --- a/ui/resources/default_200_percent/cros/pointers/copy.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/pointers/crosshair.png b/ui/resources/default_200_percent/cros/pointers/crosshair.png Binary files differdeleted file mode 100644 index 3fabdfd..0000000 --- a/ui/resources/default_200_percent/cros/pointers/crosshair.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/pointers/fleur.png b/ui/resources/default_200_percent/cros/pointers/fleur.png Binary files differdeleted file mode 100644 index 7367323..0000000 --- a/ui/resources/default_200_percent/cros/pointers/fleur.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/pointers/hand2.png b/ui/resources/default_200_percent/cros/pointers/hand2.png Binary files differdeleted file mode 100644 index 9d6dc5e..0000000 --- a/ui/resources/default_200_percent/cros/pointers/hand2.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/pointers/hand3.png b/ui/resources/default_200_percent/cros/pointers/hand3.png Binary files differdeleted file mode 100644 index fdfcf07..0000000 --- a/ui/resources/default_200_percent/cros/pointers/hand3.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/pointers/help.png b/ui/resources/default_200_percent/cros/pointers/help.png Binary files differdeleted file mode 100644 index 6403970..0000000 --- a/ui/resources/default_200_percent/cros/pointers/help.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/pointers/left_ptr.png b/ui/resources/default_200_percent/cros/pointers/left_ptr.png Binary files differdeleted file mode 100644 index 927101b..0000000 --- a/ui/resources/default_200_percent/cros/pointers/left_ptr.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/pointers/move.png b/ui/resources/default_200_percent/cros/pointers/move.png Binary files differdeleted file mode 100644 index 7110200..0000000 --- a/ui/resources/default_200_percent/cros/pointers/move.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/pointers/nodrop.png b/ui/resources/default_200_percent/cros/pointers/nodrop.png Binary files differdeleted file mode 100644 index ca47fba..0000000 --- a/ui/resources/default_200_percent/cros/pointers/nodrop.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/pointers/sb_h_double_arrow.png b/ui/resources/default_200_percent/cros/pointers/sb_h_double_arrow.png Binary files differdeleted file mode 100644 index 3d9f385..0000000 --- a/ui/resources/default_200_percent/cros/pointers/sb_h_double_arrow.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/pointers/sb_v_double_arrow.png b/ui/resources/default_200_percent/cros/pointers/sb_v_double_arrow.png Binary files differdeleted file mode 100644 index 6aa6dbe..0000000 --- a/ui/resources/default_200_percent/cros/pointers/sb_v_double_arrow.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/pointers/top_left_corner.png b/ui/resources/default_200_percent/cros/pointers/top_left_corner.png Binary files differdeleted file mode 100644 index 66b0a4d..0000000 --- a/ui/resources/default_200_percent/cros/pointers/top_left_corner.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/pointers/top_right_corner.png b/ui/resources/default_200_percent/cros/pointers/top_right_corner.png Binary files differdeleted file mode 100644 index 52a7937..0000000 --- a/ui/resources/default_200_percent/cros/pointers/top_right_corner.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/pointers/xterm.png b/ui/resources/default_200_percent/cros/pointers/xterm.png Binary files differdeleted file mode 100644 index 88f3a8c2..0000000 --- a/ui/resources/default_200_percent/cros/pointers/xterm.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/pointers/xterm_horiz.png b/ui/resources/default_200_percent/cros/pointers/xterm_horiz.png Binary files differdeleted file mode 100644 index 2a9971e..0000000 --- a/ui/resources/default_200_percent/cros/pointers/xterm_horiz.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/pointers/zoom_in.png b/ui/resources/default_200_percent/cros/pointers/zoom_in.png Binary files differdeleted file mode 100644 index b529b70..0000000 --- a/ui/resources/default_200_percent/cros/pointers/zoom_in.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/pointers/zoom_out.png b/ui/resources/default_200_percent/cros/pointers/zoom_out.png Binary files differdeleted file mode 100644 index 1e569a3..0000000 --- a/ui/resources/default_200_percent/cros/pointers/zoom_out.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/window_close_fullscreen_hover.png b/ui/resources/default_200_percent/cros/window_close_fullscreen_hover.png Binary files differdeleted file mode 100644 index d21e42f..0000000 --- a/ui/resources/default_200_percent/cros/window_close_fullscreen_hover.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/window_close_fullscreen_normal.png b/ui/resources/default_200_percent/cros/window_close_fullscreen_normal.png Binary files differdeleted file mode 100644 index 8f5c322..0000000 --- a/ui/resources/default_200_percent/cros/window_close_fullscreen_normal.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/window_close_fullscreen_pressed.png b/ui/resources/default_200_percent/cros/window_close_fullscreen_pressed.png Binary files differdeleted file mode 100644 index 284afd6..0000000 --- a/ui/resources/default_200_percent/cros/window_close_fullscreen_pressed.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/window_close_short_black_hover.png b/ui/resources/default_200_percent/cros/window_close_short_black_hover.png Binary files differdeleted file mode 100644 index c259209..0000000 --- a/ui/resources/default_200_percent/cros/window_close_short_black_hover.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/window_close_short_black_normal.png b/ui/resources/default_200_percent/cros/window_close_short_black_normal.png Binary files differdeleted file mode 100644 index 2c9edd7..0000000 --- a/ui/resources/default_200_percent/cros/window_close_short_black_normal.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/window_close_short_black_pressed.png b/ui/resources/default_200_percent/cros/window_close_short_black_pressed.png Binary files differdeleted file mode 100644 index 00c58e0..0000000 --- a/ui/resources/default_200_percent/cros/window_close_short_black_pressed.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/window_close_short_hover.png b/ui/resources/default_200_percent/cros/window_close_short_hover.png Binary files differdeleted file mode 100644 index 0346a33..0000000 --- a/ui/resources/default_200_percent/cros/window_close_short_hover.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/window_close_short_normal.png b/ui/resources/default_200_percent/cros/window_close_short_normal.png Binary files differdeleted file mode 100644 index 4af8f31..0000000 --- a/ui/resources/default_200_percent/cros/window_close_short_normal.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/window_close_short_pressed.png b/ui/resources/default_200_percent/cros/window_close_short_pressed.png Binary files differdeleted file mode 100644 index 46f04bd..0000000 --- a/ui/resources/default_200_percent/cros/window_close_short_pressed.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/window_close_tall_hover.png b/ui/resources/default_200_percent/cros/window_close_tall_hover.png Binary files differdeleted file mode 100644 index 3e82f62..0000000 --- a/ui/resources/default_200_percent/cros/window_close_tall_hover.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/window_close_tall_normal.png b/ui/resources/default_200_percent/cros/window_close_tall_normal.png Binary files differdeleted file mode 100644 index ca4b68b..0000000 --- a/ui/resources/default_200_percent/cros/window_close_tall_normal.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/window_close_tall_pressed.png b/ui/resources/default_200_percent/cros/window_close_tall_pressed.png Binary files differdeleted file mode 100644 index f330d5f..0000000 --- a/ui/resources/default_200_percent/cros/window_close_tall_pressed.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/window_position_left_hover.png b/ui/resources/default_200_percent/cros/window_position_left_hover.png Binary files differdeleted file mode 100644 index b61c239..0000000 --- a/ui/resources/default_200_percent/cros/window_position_left_hover.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/window_position_left_hover_restore.png b/ui/resources/default_200_percent/cros/window_position_left_hover_restore.png Binary files differdeleted file mode 100644 index 33f495c..0000000 --- a/ui/resources/default_200_percent/cros/window_position_left_hover_restore.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/window_position_left_normal.png b/ui/resources/default_200_percent/cros/window_position_left_normal.png Binary files differdeleted file mode 100644 index 4b2ec08..0000000 --- a/ui/resources/default_200_percent/cros/window_position_left_normal.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/window_position_left_normal_restore.png b/ui/resources/default_200_percent/cros/window_position_left_normal_restore.png Binary files differdeleted file mode 100644 index f9943c5..0000000 --- a/ui/resources/default_200_percent/cros/window_position_left_normal_restore.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/window_position_left_pressed.png b/ui/resources/default_200_percent/cros/window_position_left_pressed.png Binary files differdeleted file mode 100644 index 2af0a01..0000000 --- a/ui/resources/default_200_percent/cros/window_position_left_pressed.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/window_position_left_pressed_restore.png b/ui/resources/default_200_percent/cros/window_position_left_pressed_restore.png Binary files differdeleted file mode 100644 index e9f6a70..0000000 --- a/ui/resources/default_200_percent/cros/window_position_left_pressed_restore.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/window_position_middle_hover.png b/ui/resources/default_200_percent/cros/window_position_middle_hover.png Binary files differdeleted file mode 100644 index 21e1fad..0000000 --- a/ui/resources/default_200_percent/cros/window_position_middle_hover.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/window_position_middle_normal.png b/ui/resources/default_200_percent/cros/window_position_middle_normal.png Binary files differdeleted file mode 100644 index 6c5373c..0000000 --- a/ui/resources/default_200_percent/cros/window_position_middle_normal.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/window_position_middle_pressed.png b/ui/resources/default_200_percent/cros/window_position_middle_pressed.png Binary files differdeleted file mode 100644 index 2234a49..0000000 --- a/ui/resources/default_200_percent/cros/window_position_middle_pressed.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/window_position_right_hover.png b/ui/resources/default_200_percent/cros/window_position_right_hover.png Binary files differdeleted file mode 100644 index 70c39f4..0000000 --- a/ui/resources/default_200_percent/cros/window_position_right_hover.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/window_position_right_hover_restore.png b/ui/resources/default_200_percent/cros/window_position_right_hover_restore.png Binary files differdeleted file mode 100644 index fd340c3..0000000 --- a/ui/resources/default_200_percent/cros/window_position_right_hover_restore.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/window_position_right_normal.png b/ui/resources/default_200_percent/cros/window_position_right_normal.png Binary files differdeleted file mode 100644 index 1c6b5a2..0000000 --- a/ui/resources/default_200_percent/cros/window_position_right_normal.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/window_position_right_normal_restore.png b/ui/resources/default_200_percent/cros/window_position_right_normal_restore.png Binary files differdeleted file mode 100644 index 93b00a6..0000000 --- a/ui/resources/default_200_percent/cros/window_position_right_normal_restore.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/window_position_right_pressed.png b/ui/resources/default_200_percent/cros/window_position_right_pressed.png Binary files differdeleted file mode 100644 index de19351f..0000000 --- a/ui/resources/default_200_percent/cros/window_position_right_pressed.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/window_position_right_pressed_restore.png b/ui/resources/default_200_percent/cros/window_position_right_pressed_restore.png Binary files differdeleted file mode 100644 index d237073..0000000 --- a/ui/resources/default_200_percent/cros/window_position_right_pressed_restore.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/window_size_fullscreen_hover.png b/ui/resources/default_200_percent/cros/window_size_fullscreen_hover.png Binary files differdeleted file mode 100644 index 74954f7..0000000 --- a/ui/resources/default_200_percent/cros/window_size_fullscreen_hover.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/window_size_fullscreen_normal.png b/ui/resources/default_200_percent/cros/window_size_fullscreen_normal.png Binary files differdeleted file mode 100644 index 471b148e..0000000 --- a/ui/resources/default_200_percent/cros/window_size_fullscreen_normal.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/window_size_fullscreen_pressed.png b/ui/resources/default_200_percent/cros/window_size_fullscreen_pressed.png Binary files differdeleted file mode 100644 index b65b7c9..0000000 --- a/ui/resources/default_200_percent/cros/window_size_fullscreen_pressed.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/window_size_short_black_hover.png b/ui/resources/default_200_percent/cros/window_size_short_black_hover.png Binary files differdeleted file mode 100644 index 22137182..0000000 --- a/ui/resources/default_200_percent/cros/window_size_short_black_hover.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/window_size_short_black_normal.png b/ui/resources/default_200_percent/cros/window_size_short_black_normal.png Binary files differdeleted file mode 100644 index 3aa2e61..0000000 --- a/ui/resources/default_200_percent/cros/window_size_short_black_normal.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/window_size_short_black_pressed.png b/ui/resources/default_200_percent/cros/window_size_short_black_pressed.png Binary files differdeleted file mode 100644 index 4a5ee0b..0000000 --- a/ui/resources/default_200_percent/cros/window_size_short_black_pressed.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/window_size_short_hover.png b/ui/resources/default_200_percent/cros/window_size_short_hover.png Binary files differdeleted file mode 100644 index 1297602..0000000 --- a/ui/resources/default_200_percent/cros/window_size_short_hover.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/window_size_short_normal.png b/ui/resources/default_200_percent/cros/window_size_short_normal.png Binary files differdeleted file mode 100644 index 7ee1e70..0000000 --- a/ui/resources/default_200_percent/cros/window_size_short_normal.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/window_size_short_pressed.png b/ui/resources/default_200_percent/cros/window_size_short_pressed.png Binary files differdeleted file mode 100644 index 0f18450..0000000 --- a/ui/resources/default_200_percent/cros/window_size_short_pressed.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/window_size_tall_hover.png b/ui/resources/default_200_percent/cros/window_size_tall_hover.png Binary files differdeleted file mode 100644 index 24f3122..0000000 --- a/ui/resources/default_200_percent/cros/window_size_tall_hover.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/window_size_tall_normal.png b/ui/resources/default_200_percent/cros/window_size_tall_normal.png Binary files differdeleted file mode 100644 index 16db8db..0000000 --- a/ui/resources/default_200_percent/cros/window_size_tall_normal.png +++ /dev/null diff --git a/ui/resources/default_200_percent/cros/window_size_tall_pressed.png b/ui/resources/default_200_percent/cros/window_size_tall_pressed.png Binary files differdeleted file mode 100644 index 1af02f8..0000000 --- a/ui/resources/default_200_percent/cros/window_size_tall_pressed.png +++ /dev/null diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd index a0a98a4..c6c952f 100644 --- a/ui/resources/ui_resources.grd +++ b/ui/resources/ui_resources.grd @@ -25,246 +25,6 @@ <structure type="chrome_scaled_image" name="IDR_APP_TOP_LEFT" file="app_top_left.png" /> <structure type="chrome_scaled_image" name="IDR_APP_TOP_RIGHT" file="app_top_right.png" /> </if> - <if expr="pp_ifdef('use_aura')"> - <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="ash/launcher_background.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_BROWSER" file="ash/launcher_browser.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_BROWSER_PANEL" file="ash/launcher_browser_panel.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_BROWSER_SHORTCUT" file="aura/chromium-32.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_DIMMING" file="ash/launcher_dimming.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_ICON_APPLIST" file="ash/launcher_applist.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_ICON_APPLIST_HOT" file="ash/launcher_applist_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_ICON_APPLIST_PUSHED" file="ash/launcher_applist_pressed.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_INCOGNITO_BROWSER" file="ash/launcher_incognito_browser.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_INCOGNITO_BROWSER_PANEL" file="ash/launcher_incognito_browser_panel.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_OVERFLOW" file="ash/launcher_overflow.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_UNDERLINE_ACTIVE" file="ash/launcher_underline_active.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_UNDERLINE_HOVER" file="ash/launcher_underline_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_UNDERLINE_RUNNING" file="ash/launcher_underline_running.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_UNDERLINE_VERTICAL_ACTIVE" file="ash/launcher_underline_active.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_UNDERLINE_VERTICAL_HOVER" file="ash/launcher_underline_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_UNDERLINE_VERTICAL_RUNNING" file="ash/launcher_underline_running.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_MULTI_WINDOW_RESIZE_H" file="ash/multi_window_resize_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_MULTI_WINDOW_RESIZE_V" file="ash/multi_window_resize_v.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_RESIZE_SHADOW_BOTTOM" file="ash/resize_shadow_bottom.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_RESIZE_SHADOW_BOTTOM_LEFT" file="ash/resize_shadow_bottom_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_RESIZE_SHADOW_BOTTOM_RIGHT" file="ash/resize_shadow_bottom_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_RESIZE_SHADOW_LEFT" file="ash/resize_shadow_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_RESIZE_SHADOW_RIGHT" file="ash/resize_shadow_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_RESIZE_SHADOW_TOP" file="ash/resize_shadow_top.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_RESIZE_SHADOW_TOP_LEFT" file="ash/resize_shadow_top_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_RESIZE_SHADOW_TOP_RIGHT" file="ash/resize_shadow_top_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_ACTIVE_BOTTOM" file="ash/window_shadow_active_bottom.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_ACTIVE_BOTTOM_LEFT" file="ash/window_shadow_active_bottom_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_ACTIVE_BOTTOM_RIGHT" file="ash/window_shadow_active_bottom_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_ACTIVE_LEFT" file="ash/window_shadow_active_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_ACTIVE_RIGHT" file="ash/window_shadow_active_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_ACTIVE_TOP" file="ash/window_shadow_active_top.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_ACTIVE_TOP_LEFT" file="ash/window_shadow_active_top_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_ACTIVE_TOP_RIGHT" file="ash/window_shadow_active_top_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_INACTIVE_BOTTOM" file="ash/window_shadow_inactive_bottom.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_INACTIVE_BOTTOM_LEFT" file="ash/window_shadow_inactive_bottom_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_INACTIVE_BOTTOM_RIGHT" file="ash/window_shadow_inactive_bottom_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_INACTIVE_LEFT" file="ash/window_shadow_inactive_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_INACTIVE_RIGHT" file="ash/window_shadow_inactive_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_INACTIVE_TOP" file="ash/window_shadow_inactive_top.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_INACTIVE_TOP_LEFT" file="ash/window_shadow_inactive_top_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_INACTIVE_TOP_RIGHT" file="ash/window_shadow_inactive_top_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_SMALL_BOTTOM" file="ash/small_shadow_bottom.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_SMALL_BOTTOM_LEFT" file="ash/small_shadow_bottom_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_SMALL_BOTTOM_RIGHT" file="ash/small_shadow_bottom_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_SMALL_LEFT" file="ash/small_shadow_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_SMALL_RIGHT" file="ash/small_shadow_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_SMALL_TOP" file="ash/small_shadow_top.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_SMALL_TOP_LEFT" file="ash/small_shadow_top_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_SMALL_TOP_RIGHT" file="ash/small_shadow_top_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_SWITCH_MONITOR" file="ash/switch_monitor.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_ACCESSIBILITY" file="ash/status_accessibility_mode.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_ACCESSIBILITY_DARK" file="ash/status_accessibility_dark.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_BLUETOOTH" file="ash/status_bluetooth.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED" file="ash/status_bluetooth_disabled.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED_HOVER" file="ash/status_bluetooth_disabled_h.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED" file="ash/status_bluetooth_enabled.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED_HOVER" file="ash/status_bluetooth_enabled_h.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_BRIGHTNESS" file="ash/status_brightness.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_CAPS_LOCK" file="ash/status_capslock.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_CAPS_LOCK_DARK" file="ash/status_capslock_dark.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_CELLULAR_DISABLED" file="ash/status_cellular_disabled.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_CELLULAR_DISABLED_HOVER" file="ash/status_cellular_disabled_h.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_CELLULAR_ENABLED" file="ash/status_cellular_enabled.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_CELLULAR_ENABLED_HOVER" file="ash/status_cellular_enabled_h.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_DISPLAY" file="ash/status_display.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_DISPLAY_HOVER" file="ash/status_display_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_DISPLAY_PRESSED" file="ash/status_display_pressed.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_DRIVE" file="ash/status_drive.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_DRIVE_CANCEL" file="ash/status_drive_item_cancel.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_DRIVE_CANCEL_HOVER" file="ash/status_drive_item_cancel_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_DRIVE_DONE" file="ash/status_drive_item_done.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_DRIVE_FAILED" file="ash/status_drive_item_failed.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_DRIVE_LIGHT" file="ash/status_drive_light.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_HELP" file="ash/status_help.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_HELP_HOVER" file="ash/status_help_h.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_IME" file="ash/status_ime.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_LESS" file="ash/status_less.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_LOCALE" file="ash/status_locale.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_LOCKSCREEN" file="ash/status_lockscreen.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_LOCKSCREEN_HOVER" file="ash/status_lockscreen_h.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_MORE" file="ash/status_more.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_DATA_LOW" file="ash/status_data_low.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_DATA_NONE" file="ash/status_data_none.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_FAILED" file="ash/status_network_failed.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_INFO" file="ash/status_network_info.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_INFO_HOVER" file="ash/status_network_info_h.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_POWER_SMALL" file="ash/status_power_small_all.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_POWER_SMALL_DARK" file="ash/status_power_small_all_dark.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SETTINGS" file="ash/status_settings.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SHUTDOWN" file="ash/status_shutdown.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SHUTDOWN_HOVER" file="ash/status_shutdown_h.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SMS" file="ash/status_sms.png" /> - - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE" file="ash/status_update.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE_GREEN" file="ash/status_update_green.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE_ORANGE" file="ash/status_update_orange.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE_RED" file="ash/status_update_red.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE_DARK" file="ash/status_update_dark.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE_DARK_GREEN" file="ash/status_update_dark_green.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE_DARK_ORANGE" file="ash/status_update_dark_orange.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE_DARK_RED" file="ash/status_update_dark_red.png" /> - - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_VOLUME_LEVELS" file="ash/status_volume_dark.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_VOLUME_MUTE" file="ash/status_volume_mute.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_DISABLED" file="ash/status_wifi_disabled.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_DISABLED_HOVER" file="ash/status_wifi_disabled_h.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_ENABLED" file="ash/status_wifi_enabled.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_ENABLED_HOVER" file="ash/status_wifi_enabled_h.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NOTIFY_CLOSE" file="ash/status_notify_x.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NOTIFY_BUTTON_ACTIVE_NORMAL" file="ash/notification_button_active_normal.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NOTIFY_BUTTON_ACTIVE_HOVER" file="ash/notification_button_active_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NOTIFY_BUTTON_ACTIVE_PRESSED" file="ash/notification_button_active_pressed.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NOTIFY_BUTTON_INACTIVE_NORMAL" file="ash/notification_button_inactive_normal.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NOTIFY_BUTTON_INACTIVE_HOVER" file="ash/notification_button_inactive_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NOTIFY_BUTTON_INACTIVE_PRESSED" file="ash/notification_button_inactive_pressed.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_BUTTON_SEPARATOR" file="aura/window_button_separator.png" /> - <!-- TODO(benrg): Get rid of all conditionals that test the output - context. --> - <if expr="context.startswith('default_')"> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE" file="cros/window_close_fullscreen_normal.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE_H" file="cros/window_close_fullscreen_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE_P" file="cros/window_close_fullscreen_pressed.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE" file="cros/window_size_fullscreen_normal.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE_H" file="cros/window_size_fullscreen_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE_P" file="cros/window_size_fullscreen_pressed.png" /> - </if> - <if expr="not context.startswith('default_')"> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE" file="aura/window_close_normal.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE_H" file="aura/window_close_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE_P" file="aura/window_close_pressed.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE" file="aura/window_restore_normal.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE_H" file="aura/window_restore_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE_P" file="aura/window_restore_pressed.png" /> - </if> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_SHADOW" file="aura/window_fullscreen_shadow.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_BASE_ACTIVE" file="aura/window_header_base_active.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_BASE_INACTIVE" file="aura/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="aura/window_header_base_incognito_active.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_BASE_INCOGNITO_INACTIVE" file="aura/window_header_base_incognito_inactive.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_BOTTOM" file="aura/window_header_shade_bottom.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_BOTTOM_LEFT" file="aura/window_header_shade_bottom_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_BOTTOM_RIGHT" file="aura/window_header_shade_bottom_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_LEFT" file="aura/window_header_shade_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_MIDDLE" file="aura/window_header_shade_middle.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_RIGHT" file="aura/window_header_shade_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_TOP" file="aura/window_header_shade_top.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_TOP_LEFT" file="aura/window_header_shade_top_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_TOP_RIGHT" file="aura/window_header_shade_top_right.png" /> - - <if expr="context.startswith('default_')"> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CLOSE" file="cros/window_close_tall_normal.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CLOSE_H" file="cros/window_close_tall_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CLOSE_P" file="cros/window_close_tall_pressed.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE" file="cros/window_close_short_normal.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE_H" file="cros/window_close_short_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE_P" file="cros/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="cros/window_close_short_black_normal.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE2_H" file="cros/window_close_short_black_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE2_P" file="cros/window_close_short_black_pressed.png" /> - - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZE" file="cros/window_size_tall_normal.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZE_H" file="cros/window_size_tall_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZE_P" file="cros/window_size_tall_pressed.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE" file="cros/window_size_short_normal.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE_H" file="cros/window_size_short_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE_P" file="cros/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="cros/window_size_short_black_normal.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE2_H" file="cros/window_size_short_black_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE2_P" file="cros/window_size_short_black_pressed.png" /> - </if> - <if expr="not context.startswith('default_')"> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CLOSE" file="aura/window_close_normal.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CLOSE_H" file="aura/window_close_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CLOSE_P" file="aura/window_close_pressed.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE" file="aura/window_close_normal.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE_H" file="aura/window_close_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE_P" file="aura/window_close_pressed.png" /> - - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZE" file="aura/window_maximize_normal.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZE_H" file="aura/window_maximize_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZE_P" file="aura/window_maximize_pressed.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE" file="aura/window_restore_normal.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE_H" file="aura/window_restore_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE_P" file="aura/window_restore_pressed.png" /> - </if> - - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_LEFT" file="cros/window_position_left_normal.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_LEFT_H" file="cros/window_position_left_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_LEFT_P" file="cros/window_position_left_pressed.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_MIDDLE" file="cros/window_position_middle_normal.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_MIDDLE_H" file="cros/window_position_middle_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_MIDDLE_P" file="cros/window_position_middle_pressed.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_RIGHT" file="cros/window_position_right_normal.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_RIGHT_H" file="cros/window_position_right_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_RIGHT_P" file="cros/window_position_right_pressed.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_LEFT_RESTORE" file="cros/window_position_left_normal_restore.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_LEFT_RESTORE_H" file="cros/window_position_left_hover_restore.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_LEFT_RESTORE_P" file="cros/window_position_left_pressed_restore.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_RIGHT_RESTORE" file="cros/window_position_right_normal_restore.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_RIGHT_RESTORE_H" file="cros/window_position_right_hover_restore.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_RIGHT_RESTORE_P" file="cros/window_position_right_pressed_restore.png" /> - - </if> <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_BADGE_CENTER" file="browser_action_badge_center.png" /> <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_BADGE_LEFT" file="browser_action_badge_left.png" /> <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_BADGE_RIGHT" file="browser_action_badge_right.png" /> |
