chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc - Issue 231673005: Move ShortcutInfo, ShortcutLocations from ShellIntegration to web_app.

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/apps/chrome_native_app_window_views_win.cc

Issue 231673005: Move ShortcutInfo, ShortcutLocations from ShellIntegration to web_app. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address comments Created 6 years, 8 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/views/apps/chrome_native_app_window_views_win.h ('k') | chrome/browser/ui/views/create_application_shortcut_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc

diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc

index 2c7ef56f99b2853cec2ce618919597a3e73affff..94cddd453f7fead5a31c65c3c43d36013394df53 100644

--- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc

+++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc

@@ -36,7 +36,7 @@ namespace {

void CreateIconAndSetRelaunchDetails(

const base::FilePath& web_app_path,

const base::FilePath& icon_file,

- const ShellIntegration::ShortcutInfo& shortcut_info,

+ const web_app::ShortcutInfo& shortcut_info,

const HWND hwnd) {

DCHECK(content::BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());

@@ -88,7 +88,7 @@ void ChromeNativeAppWindowViewsWin::ActivateParentDesktopIfNecessary() {

}

void ChromeNativeAppWindowViewsWin::OnShortcutInfoLoaded(

- const ShellIntegration::ShortcutInfo& shortcut_info) {

+ const web_app::ShortcutInfo& shortcut_info) {

DCHECK_CURRENTLY_ON(content::BrowserThread::UI);

HWND hwnd = GetNativeAppWindowHWND();