Show settings browser windows as a separate launcher item
commit5f3be2b6a5bcfc34876c6ef832c0bea3564a8dd4
authorstevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Fri, 18 Apr 2014 22:27:39 +0000 (18 22:27 +0000)
committerstevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Fri, 18 Apr 2014 22:27:39 +0000 (18 22:27 +0000)
tree9219523a313286ca84c177b501d297848bb1a68b
parent20bdbbc2f796bec524711d6ec950239f3a4673fd
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
16 files changed:
ash/resources/ash_resources.grd
ash/resources/default_100_percent/common/shelf/settings_app_icon.png [new file with mode: 0644]
ash/resources/default_200_percent/common/shelf/settings_app_icon.png [new file with mode: 0644]
chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc
chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h
chrome/browser/ui/ash/launcher/browser_status_monitor.cc
chrome/browser/ui/ash/launcher/browser_status_monitor.h
chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
chrome/browser/ui/chrome_pages.cc
chrome/browser/ui/chrome_pages.h
chrome/browser/ui/settings_window_manager.cc
chrome/browser/ui/settings_window_manager.h
chrome/browser/ui/settings_window_manager_browsertest.cc [new file with mode: 0644]
chrome/browser/ui/settings_window_manager_observer.h [new file with mode: 0644]
chrome/chrome_browser_ui.gypi
chrome/chrome_tests.gypi