Suffix Chrome's appid on user-level installs

chrome/browser/ui/browser.cc

 // Copyright (c) 2012 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/ui/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 516 matching lines @@
   DCHECK(!window_);
 
   window_ = CreateBrowserWindow();
   fullscreen_controller_ = new FullscreenController(window_, profile_, this);
 
 #if defined(OS_WIN) && !defined(USE_AURA)
   // Set the app user model id for this application to that of the application
   // name.  See http://crbug.com/7028.
   ui::win::SetAppIdForWindow(
       is_app() && !is_type_panel() ?
-      ShellIntegration::GetAppId(UTF8ToWide(app_name_), profile_->GetPath()) :
-      ShellIntegration::GetChromiumAppId(profile_->GetPath()),
+      ShellIntegration::GetAppModelId(UTF8ToWide(app_name_),
+                                        profile_->GetPath()) :

[grt (UTC plus 2), 2012/06/15 19:24:07]

nit: indentation (does it fit on the previous line now?)

[gab, 2012/06/15 19:29:59]

Done (no doesn't fit above).

+      ShellIntegration::GetChromiumModelId(profile_->GetPath()),
       window()->GetNativeWindow());
 
   if (is_type_panel()) {
     ui::win::SetAppIconForWindow(ShellIntegration::GetChromiumIconPath(),
                                  window()->GetNativeWindow());
   }
 #endif
 
   // Create the extension window controller before sending notifications.
   extension_window_controller_.reset(
@@ skipping 4676 matching lines @@
   if (contents && !allow_js_access) {
     contents->web_contents()->GetController().LoadURL(
         target_url,
         content::Referrer(),
         content::PAGE_TRANSITION_LINK,
         std::string());  // No extra headers.
   }
 
   return contents != NULL;
 }