Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(687)

Unified Diff: chrome/browser/ui/views/frame/opaque_browser_frame_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, 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:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
index b52d671e06e1c734342637b85070f678fbf6fb5b..100b5fa91324a0d2dc8e27c5ca9227b221470b8f 100644
--- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
+++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
@@ -44,6 +44,10 @@
#include "views/widget/root_view.h"
#include "views/window/window_shape.h"
+#if defined(USE_VIRTUAL_KEYBOARD)
+#include "chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.h"
+#endif
+
#if !defined(OS_WIN)
#include "views/window/hit_test.h"
#endif
@@ -207,6 +211,11 @@ OpaqueBrowserFrameView::OpaqueBrowserFrameView(BrowserFrame* frame,
registrar_.Add(this, chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED,
NotificationService::AllSources());
}
+
+#if defined(USE_VIRTUAL_KEYBOARD)
+ // Make sure the singleton VirtualKeyboardManager object is initialized.
+ VirtualKeyboardManager::GetInstance();
+#endif
}
OpaqueBrowserFrameView::~OpaqueBrowserFrameView() {
« no previous file with comments | « chrome/browser/ui/touch/frame/touch_browser_frame_view.cc ('k') | chrome/browser/ui/webui/chrome_web_ui_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698