Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1616)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/resources/ash_resources.grd

Issue 148003003: Use white header for app windows part #2 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/resources/default_100_percent/common/browser_window_control_background_maximized_hover.png » ('j') | ash/system/chromeos/network/tray_sms.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/resources/ash_resources.grd
diff --git a/ash/resources/ash_resources.grd b/ash/resources/ash_resources.grd
index 6dbb807a8243fec927956f32edfc533fcc9725f8..b274a85ea668ddc0f50397e95a102cdcd982ad3c 100644
--- a/ash/resources/ash_resources.grd
+++ b/ash/resources/ash_resources.grd
@@ -17,6 +17,32 @@
<!-- KEEP THESE IN ALPHABETICAL ORDER! DO NOT ADD TO RANDOM PLACES JUST
BECAUSE YOUR RESOURCES ARE FUNCTIONALLY RELATED OR FALL UNDER THE
SAME CONDITIONALS. -->
+ <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_HEADER_BASE_MAXIMIZED" file="common/browser_window_header_base_maximized.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_HEADER_BASE_RESTORED_ACTIVE" file="common/browser_window_header_base_active.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_HEADER_BASE_RESTORED_INACTIVE" file="common/browser_window_header_base_inactive.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_HEADER_BASE_RESTORED_INCOGNITO_ACTIVE" file="common/browser_window_header_base_incognito_active.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_HEADER_BASE_RESTORED_INCOGNITO_INACTIVE" file="common/browser_window_header_base_incognito_inactive.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_HEADER_SHADE_LEFT" file="common/browser_window_header_shade_left.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_HEADER_SHADE_RIGHT" file="common/browser_window_header_shade_right.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_HEADER_SHADE_TOP" file="common/browser_window_header_shade_top.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_HEADER_SHADE_TOP_LEFT" file="common/browser_window_header_shade_top_left.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_HEADER_SHADE_TOP_RIGHT" file="common/browser_window_header_shade_top_right.png" />
+
+ <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_MAXIMIZED_H" file="common/browser_window_control_background_maximized_hover.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_MAXIMIZED_P" file="common/browser_window_control_background_maximized_pressed.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_RESTORED_H" file="common/browser_window_control_background_restored_hover.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_RESTORED_P" file="common/browser_window_control_background_restored_pressed.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_CLOSE" file="common/browser_window_control_icon_maximized_close.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_LEFT_SNAPPED" file="common/browser_window_control_icon_maximized_left_snapped.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_MINIMIZE" file="common/browser_window_control_icon_maximized_minimize.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_RIGHT_SNAPPED" file="common/browser_window_control_icon_maximized_right_snapped.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_SIZE" file="common/browser_window_control_icon_maximized_size.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_RESTORED_CLOSE" file="common/browser_window_control_icon_restored_close.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_RESTORED_LEFT_SNAPPED" file="common/browser_window_control_icon_restored_left_snapped.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_RESTORED_MINIMIZE" file="common/browser_window_control_icon_restored_minimize.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_RESTORED_RIGHT_SNAPPED" file="common/browser_window_control_icon_restored_right_snapped.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_RESTORED_SIZE" file="common/browser_window_control_icon_restored_size.png" />
+
<structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_BACKGROUND" file="common/launcher/launcher_background.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_CORNER" file="common/launcher/launcher_corner.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_DIMMING" file="common/launcher/launcher_dimming.png" />
@@ -151,6 +177,7 @@
<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SHUTDOWN" file="cros/status/status_shutdown.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SHUTDOWN_HOVER" file="cros/status/status_shutdown_hover.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SMS" file="cros/status/status_sms.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SMS_DISMISS" file="cros/status/status_sms_dismiss.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_TRACING" file="cros/status/status_tracing.png" />
<!-- ChromeOS specific icons -->
@@ -211,44 +238,24 @@
<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_ENABLED" file="cros/network/status_wifi_enabled.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_ENABLED_HOVER" file="cros/network/status_wifi_enabled_hover.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_CONTROL_BACKGROUND_H" file="common/window_control_background_hover.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CONTROL_BACKGROUND_P" file="common/window_control_background_pressed.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CONTROL_ICON_CLOSE" file="common/window_control_icon_close.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CONTROL_ICON_CLOSE_I" file="common/window_control_icon_close_inactive.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CONTROL_ICON_LEFT_SNAPPED" file="common/window_control_icon_left_snapped.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CONTROL_ICON_MINIMIZE" file="common/window_control_icon_minimize.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CONTROL_ICON_MINIMIZE_I" file="common/window_control_icon_minimize_inactive.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CONTROL_ICON_RIGHT_SNAPPED" file="common/window_control_icon_right_snapped.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CONTROL_ICON_SIZE" file="common/window_control_icon_size.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CONTROL_ICON_SIZE_I" file="common/window_control_icon_size_inactive.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" />
- <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_BASE_MINIMAL" file="common/window_header_base_minimal.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_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_HEADER_SHADE_INACTIVE_BOTTOM" file="common/window_header_shade_bottom_inactive.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_INACTIVE_LEFT" file="common/window_header_shade_left_inactive.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_INACTIVE_RIGHT" file="common/window_header_shade_right_inactive.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_INACTIVE_TOP" file="common/window_header_shade_top_inactive.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MINIMIZE_SHORT" file="common/window_minimize_short_normal.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MINIMIZE_SHORT_H" file="common/window_minimize_short_hover.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MINIMIZE_SHORT_P" file="common/window_minimize_short_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" />
« no previous file with comments | « no previous file | ash/resources/default_100_percent/common/browser_window_control_background_maximized_hover.png » ('j') | ash/system/chromeos/network/tray_sms.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698