diff options
| author | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-09 02:56:12 +0000 |
|---|---|---|
| committer | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-09 02:56:12 +0000 |
| commit | 799fe27b32f492e3392b3b1d58e605615bb27c47 (patch) | |
| tree | 3a6ca2b7cabaf9f562f54a894b7917262bd5f4f8 /chrome/app/theme/theme_resources.grd | |
| parent | 9fc675ebaf4176791bbf854945c62767c36d4a1f (diff) | |
| download | chromium_src-799fe27b32f492e3392b3b1d58e605615bb27c47.zip chromium_src-799fe27b32f492e3392b3b1d58e605615bb27c47.tar.gz chromium_src-799fe27b32f492e3392b3b1d58e605615bb27c47.tar.bz2 | |
Set the App Launcher window icon when it is shown.
This prevents the taskbar icon switching to the Chrome icon when
the taskbar is configured not to combine buttons.
BUG=167068
TEST=Set Taskbar buttons to "Never combine" in Properties and launch App Launcher. Icon should be App Launcher, not Chrome.
TBR=sky@chromium.org, oshima@chromium.org
Review URL: https://chromiumcodereview.appspot.com/12224064
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181593 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/theme/theme_resources.grd')
| -rw-r--r-- | chrome/app/theme/theme_resources.grd | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd index 1114699..ced1636 100644 --- a/chrome/app/theme/theme_resources.grd +++ b/chrome/app/theme/theme_resources.grd @@ -42,7 +42,10 @@ <structure type="chrome_scaled_image" name="IDR_ALLOWED_JAVASCRIPT" file="allowed_script.png" /> <structure type="chrome_scaled_image" name="IDR_APP_DEFAULT_ICON" file="app_default_icon.png" /> <structure type="chrome_scaled_image" name="IDR_APP_DROPARROW" file="app_droparrow.png" /> - <if expr="pp_ifdef('enable_settings_app')"> + <if expr="pp_ifdef('enable_app_list') and is_win"> + <structure type="chrome_scaled_image" name="IDR_APP_LIST" file="win/app_list.png" /> + </if> + <if expr="pp_ifdef('enable_app_list') and not pp_ifdef('chromeos')"> <structure type="chrome_scaled_image" name="IDR_APP_LIST_TAB_OVERLAY" file="app_list_tab_overlay.png" /> </if> <structure type="chrome_scaled_image" name="IDR_APP_NOTIFICATION_NUB" file="nub.png" /> |