| Index: chrome/browser/browser.cc
|
| diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
|
| index ebca6656fa3757af450ba6be2db65e86da6ce3c0..14fe317bda2db0b8f9047281a123d2d1dc6dfd74 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();
|
|
|