summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-17 08:17:24 +0000
committerxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-17 08:17:24 +0000
commit80cf356e08919b18f502f20864d6f6b72b48eb60 (patch)
treec2b531ee425730d86a1cba425293d8cb1970da7a
parent0dc2ca8ae3d110f25b9cad91fd0e15d2e6ca426d (diff)
downloadchromium_src-80cf356e08919b18f502f20864d6f6b72b48eb60.zip
chromium_src-80cf356e08919b18f502f20864d6f6b72b48eb60.tar.gz
chromium_src-80cf356e08919b18f502f20864d6f6b72b48eb60.tar.bz2
Apply andrewbunn's patch for issue 19358
The patch gives non-webapp chrome an app id so that win7 taskbar group the icons correctly. That is, webapp icons are grouped together based on app name and all chrome windows are grouped together. BUG=19358 TEST=verify fix for issue 19358 Review URL: http://codereview.chromium.org/385120 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32164 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/browser.cc14
1 files changed, 8 insertions, 6 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 64966cd..6728e5d 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -229,6 +229,14 @@ void Browser::CreateBrowserWindow() {
window_ = BrowserWindow::CreateBrowserWindow(this);
+#if defined(OS_WIN)
+ // Set the app user model id for this application to that of the application
+ // name. See http://crbug.com/7028.
+ win_util::SetAppIdForWindow(type_ & TYPE_APP ? app_name_ :
+ l10n_util::GetString(IDS_PRODUCT_NAME),
+ window()->GetNativeHandle());
+#endif
+
NotificationService::current()->Notify(
NotificationType::BROWSER_WINDOW_READY,
Source<Browser>(this),
@@ -316,12 +324,6 @@ void Browser::OpenApplicationWindow(Profile* profile, const GURL& url) {
browser->AddTabWithURL(url, GURL(), PageTransition::START_PAGE, true, -1,
false, NULL);
-#if defined(OS_WIN)
- // Set the app user model id for this application to that of the application
- // name. See http://crbug.com/7028.
- win_util::SetAppIdForWindow(app_name, browser->window()->GetNativeHandle());
-#endif
-
TabContents* tab_contents = browser->GetSelectedTabContents();
tab_contents->GetMutableRendererPrefs()->can_accept_load_drops = false;
tab_contents->render_view_host()->SyncRendererPrefs();