chrome/browser/ui/webui/chrome_web_ui_factory.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/browser/ui/webui/chrome_web_ui_factory.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, modified resources/options/language_options.html Created 9 years, 3 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/webui/chrome_web_ui_factory.cc

diff --git a/chrome/browser/ui/webui/chrome_web_ui_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_factory.cc

index cc0e555b9e8a642e4279e6768e2d090cfccb38c9..b8e7e1555ad7688c4c692279c403c07bd30ecf88 100644

--- a/chrome/browser/ui/webui/chrome_web_ui_factory.cc

+++ b/chrome/browser/ui/webui/chrome_web_ui_factory.cc

@@ -62,7 +62,7 @@

#include "chrome/browser/ui/webui/sync_promo_ui.h"

#endif

-#if defined(TOUCH_UI)

+#if defined(USE_VIRTUAL_KEYBOARD)

#include "chrome/browser/ui/webui/keyboard_ui.h"

#endif

@@ -177,7 +177,7 @@ static WebUIFactoryFunction GetWebUIFactoryFunction(Profile* profile,

return &NewWebUI<FlagsUI>;

if (url.host() == chrome::kChromeUIFlashHost)

return &NewWebUI<FlashUI>;

-#if defined(TOUCH_UI)

+#if defined(USE_VIRTUAL_KEYBOARD)

if (url.host() == chrome::kChromeUIKeyboardHost)

return &NewWebUI<KeyboardUI>;

#endif