Apply andrewbunn's patch for issue 19358

chrome/browser/browser.cc

 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/browser.h"
 
 #include "app/animation.h"
 #include "app/l10n_util.h"
 #include "base/command_line.h"
 #include "base/gfx/point.h"
@@ skipping 211 matching lines @@
 }
 
 void Browser::CreateBrowserWindow() {
   DCHECK(!window_);
 
   if (SupportsWindowFeature(FEATURE_EXTENSIONSHELF))
     extension_shelf_model_.reset(new ExtensionShelfModel(this));
 
   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),
       NotificationService::NoDetails());
 
   // Show the First Run information bubble if we've been told to.
   PrefService* local_state = g_browser_process->local_state();
   if (!local_state)
     return;
   if (local_state->IsPrefRegistered(prefs::kShouldShowFirstRunBubble) &&
@@ skipping 67 matching lines @@
 
 // static
 void Browser::OpenApplicationWindow(Profile* profile, const GURL& url) {
   std::wstring app_name = ComputeApplicationNameFromURL(url);
   RegisterAppPrefs(app_name);
 
   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
-
   TabContents* tab_contents = browser->GetSelectedTabContents();
   tab_contents->GetMutableRendererPrefs()->can_accept_load_drops = false;
   tab_contents->render_view_host()->SyncRendererPrefs();
   browser->window()->Show();
   // TODO(jcampan): http://crbug.com/8123 we should not need to set the initial
   //                focus explicitly.
   tab_contents->view()->SetInitialFocus();
 }
 
 #if defined(OS_MACOSX)
@@ skipping 2689 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserToolbarModel (private):
 
 NavigationController* Browser::BrowserToolbarModel::GetNavigationController() {
   // This |current_tab| can be NULL during the initialization of the
   // toolbar during window creation (i.e. before any tabs have been added
   // to the window).
   TabContents* current_tab = browser_->GetSelectedTabContents();
   return current_tab ? &current_tab->controller() : NULL;
 }