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

Unified Diff: chrome/browser/ui/views/dom_view.cc

Issue 8375018: aura: Move the keyboard correctly in the proper container. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
« no previous file with comments | « no previous file | chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/dom_view.cc
diff --git a/chrome/browser/ui/views/dom_view.cc b/chrome/browser/ui/views/dom_view.cc
index 762793813761d8ca440cd60fff6021996e5537ae..64ce7390c748e33c73d2c7afd022345febf9de07 100644
--- a/chrome/browser/ui/views/dom_view.cc
+++ b/chrome/browser/ui/views/dom_view.cc
@@ -80,7 +80,7 @@ void DOMView::ViewHierarchyChanged(bool is_add, views::View* parent,
}
void DOMView::AttachTabContents() {
-#if !defined(USE_AURA)
+#if defined(TOUCH_UI) || !defined(USE_AURA)
if (views::Widget::IsPureViews()) {
TabContentsViewViews* widget = static_cast<TabContentsViewViews*>(
dom_contents_->tab_contents()->view());
@@ -90,7 +90,7 @@ void DOMView::AttachTabContents() {
} else {
#endif
Attach(dom_contents_->tab_contents()->GetNativeView());
-#if !defined(USE_AURA)
+#if defined(TOUCH_UI) || !defined(USE_AURA)
}
#endif
}
« no previous file with comments | « no previous file | chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698