chrome/browser/extensions/extension_prefs.cc - Issue 11411286: Decouple IsMetroProcess() calls, introducing IsSingleWindowMetroMode().

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/extensions/extension_prefs.cc

Issue 11411286: Decouple IsMetroProcess() calls, introducing IsSingleWindowMetroMode(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merge up to r170746 Created 8 years 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/extensions/api/tabs/tabs.cc ('k') | chrome/browser/notifications/desktop_notification_service_win.cc » ('j') | chrome/browser/ui/browser_win.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_prefs.cc

diff --git a/chrome/browser/extensions/extension_prefs.cc b/chrome/browser/extensions/extension_prefs.cc

index 346133dce690ee6a59a9c85cbbf9a63e2ab63867..71691589199ee085674c322e505d5f5c4ee530d8 100644

--- a/chrome/browser/extensions/extension_prefs.cc

+++ b/chrome/browser/extensions/extension_prefs.cc

@@ -31,7 +31,7 @@

#include "ui/base/l10n/l10n_util.h"

#if defined(OS_WIN)

-#include "base/win/metro.h"

+#include "win8/util/win8_util.h"

#endif // OS_WIN

namespace extensions {

@@ -1223,7 +1223,7 @@ ExtensionPrefs::LaunchType ExtensionPrefs::GetLaunchType(

#if defined(OS_WIN)

// We don't support app windows in windows 8 metro mode.

cpu_(ooo_6.6-7.5) 2012/12/03 20:56:26 the comment needs rewording

gab 2012/12/04 00:19:06 Done.

- if (base::win::IsMetroProcess() && result == LAUNCH_WINDOW)

+ if (win8::IsSingleWindowMetroMode() && result == LAUNCH_WINDOW)

result = LAUNCH_REGULAR;

#endif // OS_WIN