diff options
author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-08 23:28:35 +0000 |
---|---|---|
committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-08 23:28:35 +0000 |
commit | f45d2a74d471efbe10c8f4e7ea044dbb0a351156 (patch) | |
tree | 76718b30e905d966d550471f7264c94cb1a112d2 /chrome/browser/browser.cc | |
parent | b9911c28e52d7d269adc2542b6198c21252bac98 (diff) | |
download | chromium_src-f45d2a74d471efbe10c8f4e7ea044dbb0a351156.zip chromium_src-f45d2a74d471efbe10c8f4e7ea044dbb0a351156.tar.gz chromium_src-f45d2a74d471efbe10c8f4e7ea044dbb0a351156.tar.bz2 |
Use web app icon as ICON_BIG for Windows
- Add a WindowDelegate::GetWindowAppIcon for BrowserView to expose an
icon to use as ICON_BIG;
- Add an app_icon_ memeber and accessor functions to TabContents;
- Update/Set the app_icon_ of TabContents when web app icon is
downloaded for converting a tab to app or for chrome web app shortcuts
update (this happens when chrome is opened as an app;
- Use the app icon as ICON_BIG in WindowWin::UpdateWindowIcon;
BUG=32039
TEST=Verify fix for issue 32039 and also Alt-Tab list on XP/Vista uses big icon.
Review URL: http://codereview.chromium.org/668265
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40962 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.cc')
-rw-r--r-- | chrome/browser/browser.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index 344a660..1c75cbc 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -382,12 +382,14 @@ void Browser::OpenApplicationWindow(Profile* profile, const GURL& url, // focus explicitly. tab_contents->view()->SetInitialFocus(); - // Set UPDATE_SHORTCUT as the pending web app action. This action is picked - // up in LoadingStateChanged to schedule a GetApplicationInfo. And when - // the web app info is available, TabContents notifies Browser via - // OnDidGetApplicationInfo, which calls web_app::UpdateShortcutForTabContents - // when it sees UPDATE_SHORTCUT as pending web app action. - browser->pending_web_app_action_ = UPDATE_SHORTCUT; + if (!as_panel) { + // Set UPDATE_SHORTCUT as the pending web app action. This action is picked + // up in LoadingStateChanged to schedule a GetApplicationInfo. And when + // the web app info is available, TabContents notifies Browser via + // OnDidGetApplicationInfo, which calls web_app::UpdateShortcutForTabContents + // when it sees UPDATE_SHORTCUT as pending web app action. + browser->pending_web_app_action_ = UPDATE_SHORTCUT; + } } #if defined(OS_MACOSX) |