diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-18 22:27:39 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-18 22:27:39 +0000 |
| commit | 5f3be2b6a5bcfc34876c6ef832c0bea3564a8dd4 (patch) | |
| tree | 9219523a313286ca84c177b501d297848bb1a68b /ash | |
| parent | 20bdbbc2f796bec524711d6ec950239f3a4673fd (diff) | |
| download | chromium_src-5f3be2b6a5bcfc34876c6ef832c0bea3564a8dd4.zip chromium_src-5f3be2b6a5bcfc34876c6ef832c0bea3564a8dd4.tar.gz chromium_src-5f3be2b6a5bcfc34876c6ef832c0bea3564a8dd4.tar.bz2 | |
Show settings browser windows as a separate launcher item
This also fixes an issue where the shelf id for browser windows was
getting set directly by BrowserStatusMonitor regardless of whether the
browser window was represented by BrowserShortcutLauncherItemController,
causing strange shelf behavior.
BUG=359816
Review URL: https://codereview.chromium.org/237693003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@264874 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/resources/ash_resources.grd | 1 | ||||
| -rw-r--r-- | ash/resources/default_100_percent/common/shelf/settings_app_icon.png | bin | 0 -> 1243 bytes | |||
| -rw-r--r-- | ash/resources/default_200_percent/common/shelf/settings_app_icon.png | bin | 0 -> 3708 bytes |
3 files changed, 1 insertions, 0 deletions
diff --git a/ash/resources/ash_resources.grd b/ash/resources/ash_resources.grd index 4fbf0b8..1201745 100644 --- a/ash/resources/ash_resources.grd +++ b/ash/resources/ash_resources.grd @@ -26,6 +26,7 @@ <structure type="chrome_scaled_image" name="IDR_ASH_SHELF_OVERFLOW" file="common/shelf/shelf_overflow.png" /> <structure type="chrome_scaled_image" name="IDR_ASH_SHELF_UNDERLINE_ACTIVE" file="common/shelf/shelf_underline_active.png" /> <structure type="chrome_scaled_image" name="IDR_ASH_SHELF_UNDERLINE_RUNNING" file="common/shelf/shelf_underline_running.png" /> + <structure type="chrome_scaled_image" name="IDR_ASH_SHELF_ICON_SETTINGS" file="common/shelf/settings_app_icon.png" /> <structure type="chrome_scaled_image" name="IDR_ASH_SHELF_ICON_TASK_MANAGER" file="common/shelf/task_manager.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" /> diff --git a/ash/resources/default_100_percent/common/shelf/settings_app_icon.png b/ash/resources/default_100_percent/common/shelf/settings_app_icon.png Binary files differnew file mode 100644 index 0000000..9682a9b --- /dev/null +++ b/ash/resources/default_100_percent/common/shelf/settings_app_icon.png diff --git a/ash/resources/default_200_percent/common/shelf/settings_app_icon.png b/ash/resources/default_200_percent/common/shelf/settings_app_icon.png Binary files differnew file mode 100644 index 0000000..716b9cf --- /dev/null +++ b/ash/resources/default_200_percent/common/shelf/settings_app_icon.png |
