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

Unified Diff: chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.cc

Issue 7574007: Require a default parent to use some Views implementations on ChromeOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 4 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/views/tab_contents/native_tab_contents_view_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.cc
diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.cc b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.cc
index 6322cc15f153c55d0386141adfe08845841a572f..e8361832f507c3ec4589aa4ebd7fa31b97fed6d9 100644
--- a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.cc
+++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.cc
@@ -13,6 +13,7 @@
#include "content/browser/tab_contents/tab_contents.h"
#include "ui/base/accessibility/accessible_view_state.h"
#include "views/focus/focus_manager.h"
+#include "views/views_delegate.h"
////////////////////////////////////////////////////////////////////////////////
// NativeTabContentsContainerGtk, public:
@@ -146,7 +147,8 @@ void NativeTabContentsContainerGtk::GetAccessibleState(
// static
NativeTabContentsContainer* NativeTabContentsContainer::CreateNativeContainer(
TabContentsContainer* container) {
- if (views::Widget::IsPureViews())
+ if (views::Widget::IsPureViews() &&
+ views::ViewsDelegate::views_delegate->GetDefaultParentView())
return new NativeTabContentsContainerViews(container);
return new NativeTabContentsContainerGtk(container);
}
« no previous file with comments | « no previous file | chrome/browser/ui/views/tab_contents/native_tab_contents_view_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698