chrome/browser/ui/views/apps/chrome_native_app_window_views_win.h - 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.h

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

Patch Set: Windws 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

« chrome/browser/shell_integration_linux.cc ('K') | « chrome/browser/ui/views/app_list/win/app_list_service_win.cc ('k') | chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc » ('j') | chrome/browser/web_applications/web_app.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index ed824e5ee7442914768600167b38af3ea99a435a..6b1c7b6defe799cd847f4541291f2e3e61a85396 100644

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

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

@@ -5,8 +5,8 @@

#ifndef CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_WIN_H_

#define CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_WIN_H_

-#include "chrome/browser/shell_integration.h"

#include "chrome/browser/ui/views/apps/chrome_native_app_window_views.h"

+#include "chrome/browser/web_applications/web_app.h"

calamity 2014/04/14 04:23:01 Should be able to just forward declare web_app::Sh

jackhou1 2014/04/14 05:49:19 Done.

class GlassAppWindowFrameViewWin;

@@ -24,7 +24,7 @@ class ChromeNativeAppWindowViewsWin : public ChromeNativeAppWindowViews {

void ActivateParentDesktopIfNecessary();

void OnShortcutInfoLoaded(

- const ShellIntegration::ShortcutInfo& shortcut_info);

+ const web_app::ShortcutInfo& shortcut_info);

HWND GetNativeAppWindowHWND() const;