chrome/browser/chromeos/login/webui_login_view.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/chromeos/login/webui_login_view.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/chromeos/login/webui_login_view.cc

diff --git a/chrome/browser/chromeos/login/webui_login_view.cc b/chrome/browser/chromeos/login/webui_login_view.cc

index 7a1376b06d24cfb81e519047446470feee117b46..d207232aa365d5bcd37a8e60fde882903e9aef33 100644

--- a/chrome/browser/chromeos/login/webui_login_view.cc

+++ b/chrome/browser/chromeos/login/webui_login_view.cc

@@ -30,7 +30,7 @@

#include "views/widget/native_widget_gtk.h"

#include "views/widget/widget.h"

-#if defined(TOUCH_UI)

+#if defined(USE_VIRTUAL_KEYBOARD)

#include "chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.h"

#endif

@@ -111,7 +111,7 @@ WebUILoginView::WebUILoginView()

status_window_(NULL),

host_window_frozen_(false),

status_area_visibility_on_init_(true) {

-#if defined(TOUCH_UI)

+#if defined(USE_VIRTUAL_KEYBOARD)

// Make sure the singleton VirtualKeyboardManager object is created.

VirtualKeyboardManager::GetInstance();

#endif