chrome/common/extensions/extension.cc - Issue 8051010: Separate Virtual Keyboard related conditionals from TouchUI

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

Issue 8051010: Separate Virtual Keyboard related conditionals from TouchUI (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Rebased on ToT, fix along with review comments Created 9 years, 2 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/common/extensions/extension.cc

diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc

index a8025e27d800b427bcc87f4da07ca35c5ed6b70a..68a29e6d8d51119704b105c9d1044a8707f9f7e3 100644

--- a/chrome/common/extensions/extension.cc

+++ b/chrome/common/extensions/extension.cc

@@ -2042,7 +2042,7 @@ bool Extension::InitFromValue(const DictionaryValue& source, int flags,

std::string val;

// Restrict override pages to a list of supported URLs.

if ((page != chrome::kChromeUINewTabHost &&

-#if defined(TOUCH_UI)

+#if defined(USE_VIRTUAL_KEYBOARD)

page != chrome::kChromeUIKeyboardHost &&

#endif

#if defined(OS_CHROMEOS)

« no previous file with comments | « chrome/common/chrome_notification_types.h ('k') | no next file » | no next file with comments »