chrome/browser/ui/views/extensions/shell_window_views.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/views/extensions/shell_window_views.cc

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

Patch Set: fix shell integration test 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/views/extensions/shell_window_views.cc

diff --git a/chrome/browser/ui/views/extensions/shell_window_views.cc b/chrome/browser/ui/views/extensions/shell_window_views.cc

index 0d32d0ac5d87245e251127fd8977c19e9ef52321..c236ba43711a5990519aeb73d11abb9449f6c866 100644

--- a/chrome/browser/ui/views/extensions/shell_window_views.cc

+++ b/chrome/browser/ui/views/extensions/shell_window_views.cc

@@ -204,8 +204,7 @@ ShellWindowViews::ShellWindowViews(Profile* profile,

std::string app_name = web_app::GenerateApplicationNameFromExtensionId(

extension->id());

ui::win::SetAppIdForWindow(

- ShellIntegration::GetAppId(UTF8ToWide(app_name),

- profile->GetPath()),

+ ShellIntegration::GetAppModelId(UTF8ToWide(app_name), profile->GetPath()),

GetWidget()->GetTopLevelWidget()->GetNativeWindow());

#endif

OnViewWasResized();