Merge 21595 - Partial fix to 7028 Pinning in Win7.A complete fix will requir...

chrome/browser/browser.cc

Index: chrome/browser/browser.cc
===================================================================
--- chrome/browser/browser.cc	(revision 21780)
+++ chrome/browser/browser.cc	(working copy)
@@ -348,6 +348,12 @@
   Browser* browser = Browser::CreateForApp(app_name, profile, false);
   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
+
   browser->GetSelectedTabContents()->render_view_host()->SetRendererPrefs(
       browser->GetSelectedTabContents()->delegate()->GetRendererPrefs());
   browser->window()->Show();
Property changes on: chrome\browser\browser.cc
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/browser/browser.cc:r21595