chrome/browser/ui/browser.cc - Issue 10542031: Suffix Chrome's appid on user-level installs

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/browser.cc

Issue 10542031: Suffix Chrome's appid on user-level installs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: remove install logic order changes and modify naming/comments Created 8 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/ui/browser.cc

diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc

index b92d4094b1ed9162f45703387239297573ed48db..110f5529189435813b8346b159f3d14584c6aaec 100644

--- a/chrome/browser/ui/browser.cc

+++ b/chrome/browser/ui/browser.cc

@@ -534,8 +534,9 @@ void Browser::InitBrowserWindow() {

// 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

gab 2012/06/15 19:29:59 Done (no doesn't fit above).

+ ShellIntegration::GetChromiumModelId(profile_->GetPath()),

window()->GetNativeWindow());

if (is_type_panel()) {