diff options
author | benwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-15 04:22:59 +0000 |
---|---|---|
committer | benwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-15 04:22:59 +0000 |
commit | 26f9032a69cb1d10732fcc29c06b4f36218c8f58 (patch) | |
tree | 833df42511f828372fc2b0de17b09618d1b4f21d | |
parent | 24e95856aad2baea5b1552f771209a172fa2ecdf (diff) | |
download | chromium_src-26f9032a69cb1d10732fcc29c06b4f36218c8f58.zip chromium_src-26f9032a69cb1d10732fcc29c06b4f36218c8f58.tar.gz chromium_src-26f9032a69cb1d10732fcc29c06b4f36218c8f58.tar.bz2 |
Merge 269477 "New binary files for app window frame buttons."
> New binary files for app window frame buttons.
>
> These are bitmaps to use in dark colored frames, for
> https://codereview.chromium.org/274013002. This change also moves
> the buttons currently in use from win/ to common/ as they are also used
> on Linux.
>
> BUG=339558
> R=oshima@chromium.org
>
> Review URL: https://codereview.chromium.org/270873004
TBR=benwells@chromium.org
Review URL: https://codereview.chromium.org/283323002
git-svn-id: svn://svn.chromium.org/chrome/branches/1985/src@270580 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/app/theme/default_100_percent/common/app_window_close.png (renamed from chrome/app/theme/default_100_percent/win/app_window_close.png) | bin | 107 -> 107 bytes | |||
-rw-r--r-- | chrome/app/theme/default_100_percent/common/app_window_close_active.png (renamed from chrome/app/theme/default_100_percent/win/app_window_close_active.png) | bin | 107 -> 107 bytes | |||
-rw-r--r-- | chrome/app/theme/default_100_percent/common/app_window_close_hover.png (renamed from chrome/app/theme/default_100_percent/win/app_window_close_hover.png) | bin | 107 -> 107 bytes | |||
-rw-r--r-- | chrome/app/theme/default_100_percent/common/app_window_close_unfocused.png (renamed from chrome/app/theme/default_100_percent/win/app_window_close_unfocused.png) | bin | 107 -> 107 bytes | |||
-rw-r--r-- | chrome/app/theme/default_100_percent/common/app_window_maximize.png (renamed from chrome/app/theme/default_100_percent/win/app_window_maximize.png) | bin | 87 -> 87 bytes | |||
-rw-r--r-- | chrome/app/theme/default_100_percent/common/app_window_maximize_active.png (renamed from chrome/app/theme/default_100_percent/win/app_window_maximize_active.png) | bin | 98 -> 98 bytes | |||
-rw-r--r-- | chrome/app/theme/default_100_percent/common/app_window_maximize_disabled.png (renamed from chrome/app/theme/default_100_percent/win/app_window_maximize_disabled.png) | bin | 87 -> 87 bytes | |||
-rw-r--r-- | chrome/app/theme/default_100_percent/common/app_window_maximize_hover.png (renamed from chrome/app/theme/default_100_percent/win/app_window_maximize_hover.png) | bin | 98 -> 98 bytes | |||
-rw-r--r-- | chrome/app/theme/default_100_percent/common/app_window_maximize_light.png | bin | 0 -> 87 bytes | |||
-rw-r--r-- | chrome/app/theme/default_100_percent/common/app_window_minimize.png (renamed from chrome/app/theme/default_100_percent/win/app_window_minimize.png) | bin | 90 -> 90 bytes | |||
-rw-r--r-- | chrome/app/theme/default_100_percent/common/app_window_minimize_active.png (renamed from chrome/app/theme/default_100_percent/win/app_window_minimize_active.png) | bin | 92 -> 92 bytes | |||
-rw-r--r-- | chrome/app/theme/default_100_percent/common/app_window_minimize_hover.png (renamed from chrome/app/theme/default_100_percent/win/app_window_minimize_hover.png) | bin | 92 -> 92 bytes | |||
-rw-r--r-- | chrome/app/theme/default_100_percent/common/app_window_minimize_light.png | bin | 0 -> 81 bytes | |||
-rw-r--r-- | chrome/app/theme/default_100_percent/common/app_window_restore.png (renamed from chrome/app/theme/default_100_percent/win/app_window_restore.png) | bin | 99 -> 99 bytes | |||
-rw-r--r-- | chrome/app/theme/default_100_percent/common/app_window_restore_active.png (renamed from chrome/app/theme/default_100_percent/win/app_window_restore_active.png) | bin | 104 -> 104 bytes | |||
-rw-r--r-- | chrome/app/theme/default_100_percent/common/app_window_restore_hover.png (renamed from chrome/app/theme/default_100_percent/win/app_window_restore_hover.png) | bin | 104 -> 104 bytes | |||
-rw-r--r-- | chrome/app/theme/default_100_percent/common/app_window_restore_light.png | bin | 0 -> 96 bytes | |||
-rw-r--r-- | chrome/app/theme/theme_resources.grd | 31 |
18 files changed, 17 insertions, 14 deletions
diff --git a/chrome/app/theme/default_100_percent/win/app_window_close.png b/chrome/app/theme/default_100_percent/common/app_window_close.png Binary files differindex 4987710..4987710 100644 --- a/chrome/app/theme/default_100_percent/win/app_window_close.png +++ b/chrome/app/theme/default_100_percent/common/app_window_close.png diff --git a/chrome/app/theme/default_100_percent/win/app_window_close_active.png b/chrome/app/theme/default_100_percent/common/app_window_close_active.png Binary files differindex fea8179..fea8179 100644 --- a/chrome/app/theme/default_100_percent/win/app_window_close_active.png +++ b/chrome/app/theme/default_100_percent/common/app_window_close_active.png diff --git a/chrome/app/theme/default_100_percent/win/app_window_close_hover.png b/chrome/app/theme/default_100_percent/common/app_window_close_hover.png Binary files differindex f3615d0..f3615d0 100644 --- a/chrome/app/theme/default_100_percent/win/app_window_close_hover.png +++ b/chrome/app/theme/default_100_percent/common/app_window_close_hover.png diff --git a/chrome/app/theme/default_100_percent/win/app_window_close_unfocused.png b/chrome/app/theme/default_100_percent/common/app_window_close_unfocused.png Binary files differindex e36a8c8..e36a8c8 100644 --- a/chrome/app/theme/default_100_percent/win/app_window_close_unfocused.png +++ b/chrome/app/theme/default_100_percent/common/app_window_close_unfocused.png diff --git a/chrome/app/theme/default_100_percent/win/app_window_maximize.png b/chrome/app/theme/default_100_percent/common/app_window_maximize.png Binary files differindex ce5c5c1d..ce5c5c1d 100644 --- a/chrome/app/theme/default_100_percent/win/app_window_maximize.png +++ b/chrome/app/theme/default_100_percent/common/app_window_maximize.png diff --git a/chrome/app/theme/default_100_percent/win/app_window_maximize_active.png b/chrome/app/theme/default_100_percent/common/app_window_maximize_active.png Binary files differindex 2b8b075..2b8b075 100644 --- a/chrome/app/theme/default_100_percent/win/app_window_maximize_active.png +++ b/chrome/app/theme/default_100_percent/common/app_window_maximize_active.png diff --git a/chrome/app/theme/default_100_percent/win/app_window_maximize_disabled.png b/chrome/app/theme/default_100_percent/common/app_window_maximize_disabled.png Binary files differindex f490708..f490708 100644 --- a/chrome/app/theme/default_100_percent/win/app_window_maximize_disabled.png +++ b/chrome/app/theme/default_100_percent/common/app_window_maximize_disabled.png diff --git a/chrome/app/theme/default_100_percent/win/app_window_maximize_hover.png b/chrome/app/theme/default_100_percent/common/app_window_maximize_hover.png Binary files differindex 447dc1d..447dc1d 100644 --- a/chrome/app/theme/default_100_percent/win/app_window_maximize_hover.png +++ b/chrome/app/theme/default_100_percent/common/app_window_maximize_hover.png diff --git a/chrome/app/theme/default_100_percent/common/app_window_maximize_light.png b/chrome/app/theme/default_100_percent/common/app_window_maximize_light.png Binary files differnew file mode 100644 index 0000000..565ccf6 --- /dev/null +++ b/chrome/app/theme/default_100_percent/common/app_window_maximize_light.png diff --git a/chrome/app/theme/default_100_percent/win/app_window_minimize.png b/chrome/app/theme/default_100_percent/common/app_window_minimize.png Binary files differindex cdaac78..cdaac78 100644 --- a/chrome/app/theme/default_100_percent/win/app_window_minimize.png +++ b/chrome/app/theme/default_100_percent/common/app_window_minimize.png diff --git a/chrome/app/theme/default_100_percent/win/app_window_minimize_active.png b/chrome/app/theme/default_100_percent/common/app_window_minimize_active.png Binary files differindex 279becb..279becb 100644 --- a/chrome/app/theme/default_100_percent/win/app_window_minimize_active.png +++ b/chrome/app/theme/default_100_percent/common/app_window_minimize_active.png diff --git a/chrome/app/theme/default_100_percent/win/app_window_minimize_hover.png b/chrome/app/theme/default_100_percent/common/app_window_minimize_hover.png Binary files differindex 4100f05..4100f05 100644 --- a/chrome/app/theme/default_100_percent/win/app_window_minimize_hover.png +++ b/chrome/app/theme/default_100_percent/common/app_window_minimize_hover.png diff --git a/chrome/app/theme/default_100_percent/common/app_window_minimize_light.png b/chrome/app/theme/default_100_percent/common/app_window_minimize_light.png Binary files differnew file mode 100644 index 0000000..032713e --- /dev/null +++ b/chrome/app/theme/default_100_percent/common/app_window_minimize_light.png diff --git a/chrome/app/theme/default_100_percent/win/app_window_restore.png b/chrome/app/theme/default_100_percent/common/app_window_restore.png Binary files differindex 6812298..6812298 100644 --- a/chrome/app/theme/default_100_percent/win/app_window_restore.png +++ b/chrome/app/theme/default_100_percent/common/app_window_restore.png diff --git a/chrome/app/theme/default_100_percent/win/app_window_restore_active.png b/chrome/app/theme/default_100_percent/common/app_window_restore_active.png Binary files differindex 56c4e72..56c4e72 100644 --- a/chrome/app/theme/default_100_percent/win/app_window_restore_active.png +++ b/chrome/app/theme/default_100_percent/common/app_window_restore_active.png diff --git a/chrome/app/theme/default_100_percent/win/app_window_restore_hover.png b/chrome/app/theme/default_100_percent/common/app_window_restore_hover.png Binary files differindex 8d396fc..8d396fc 100644 --- a/chrome/app/theme/default_100_percent/win/app_window_restore_hover.png +++ b/chrome/app/theme/default_100_percent/common/app_window_restore_hover.png diff --git a/chrome/app/theme/default_100_percent/common/app_window_restore_light.png b/chrome/app/theme/default_100_percent/common/app_window_restore_light.png Binary files differnew file mode 100644 index 0000000..f40fefd --- /dev/null +++ b/chrome/app/theme/default_100_percent/common/app_window_restore_light.png diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd index a55115e..cb0e1ef 100644 --- a/chrome/app/theme/theme_resources.grd +++ b/chrome/app/theme/theme_resources.grd @@ -53,20 +53,23 @@ </if> <structure type="chrome_scaled_image" name="IDR_ASK_MEDIA" file="ask_media.png" /> <if expr="toolkit_views"> - <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_CLOSE" file="win/app_window_close.png" /> - <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_CLOSE_H" file="win/app_window_close_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_CLOSE_P" file="win/app_window_close_active.png" /> - <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_CLOSE_U" file="win/app_window_close_unfocused.png" /> - <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_RESTORE" file="win/app_window_restore.png" /> - <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_RESTORE_H" file="win/app_window_restore_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_RESTORE_P" file="win/app_window_restore_active.png" /> - <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_MAXIMIZE" file="win/app_window_maximize.png" /> - <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_MAXIMIZE_D" file="win/app_window_maximize_disabled.png" /> - <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_MAXIMIZE_H" file="win/app_window_maximize_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_MAXIMIZE_P" file="win/app_window_maximize_active.png" /> - <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_MINIMIZE" file="win/app_window_minimize.png" /> - <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_MINIMIZE_H" file="win/app_window_minimize_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_MINIMIZE_P" file="win/app_window_minimize_active.png" /> + <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_CLOSE" file="common/app_window_close.png" /> + <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_CLOSE_H" file="common/app_window_close_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_CLOSE_P" file="common/app_window_close_active.png" /> + <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_CLOSE_U" file="common/app_window_close_unfocused.png" /> + <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_RESTORE" file="common/app_window_restore.png" /> + <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_RESTORE_H" file="common/app_window_restore_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_RESTORE_L" file="common/app_window_restore_light.png" /> + <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_RESTORE_P" file="common/app_window_restore_active.png" /> + <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_MAXIMIZE" file="common/app_window_maximize.png" /> + <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_MAXIMIZE_D" file="common/app_window_maximize_disabled.png" /> + <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_MAXIMIZE_H" file="common/app_window_maximize_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_MAXIMIZE_L" file="common/app_window_maximize_light.png" /> + <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_MAXIMIZE_P" file="common/app_window_maximize_active.png" /> + <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_MINIMIZE" file="common/app_window_minimize.png" /> + <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_MINIMIZE_H" file="common/app_window_minimize_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_MINIMIZE_L" file="common/app_window_minimize_light.png" /> + <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_MINIMIZE_P" file="common/app_window_minimize_active.png" /> </if> <if expr="use_ash"> <structure type="chrome_scaled_image" name="IDR_ASH_BROWSER_WINDOW_CONTROL_BACKGROUND_MAXIMIZED_H" file="common/ash/browser_window_control_background_maximized_hover.png" /> |