chrome/browser/ui/views/tab_contents/native_tab_contents_view_gtk.cc - Issue 7574007: Require a default parent to use some Views implementations on ChromeOS.

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/views/tab_contents/native_tab_contents_view_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

Index: chrome/browser/ui/views/tab_contents/native_tab_contents_view_gtk.cc

diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_gtk.cc b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_gtk.cc

index bdbebee0078569faf1ed41d2a201aa44dca4556a..d79f6f597d5adf8cd4faac636f4b8692c729e7ef 100644

--- a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_gtk.cc

+++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_gtk.cc

@@ -15,6 +15,7 @@

#include "content/browser/tab_contents/tab_contents_view.h"

#include "third_party/WebKit/Source/WebKit/chromium/public/WebDragData.h"

#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"

+#include "views/views_delegate.h"

using WebKit::WebDragOperation;

using WebKit::WebDragOperationsMask;

@@ -261,8 +262,8 @@ void NativeTabContentsViewGtk::PositionConstrainedWindows(

// static

NativeTabContentsView* NativeTabContentsView::CreateNativeTabContentsView(

internal::NativeTabContentsViewDelegate* delegate) {

- if (views::Widget::IsPureViews())

+ if (views::Widget::IsPureViews() &&

+ views::ViewsDelegate::views_delegate->GetDefaultParentView())

return new NativeTabContentsViewViews(delegate);

return new NativeTabContentsViewGtk(delegate);

}

« no previous file with comments | « chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.cc ('k') | no next file » | no next file with comments »