chrome/browser/ui/views/tab_contents/native_tab_contents_container_win.cc - Issue 7285027: Require a default parent to use some Views implementations on Windows.

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_container_win.cc

Issue 7285027: Require a default parent to use some Views implementations on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Patch to avoid --use-pure-views startup crashes. Created 9 years, 6 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 | « chrome/browser/ui/views/frame/browser_frame_win.cc ('k') | chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 163d59d89f17e0e020ab335263b59fed37f778f4..eea285c1d0df501b8eae6671e7a559f14e4b718f 100644

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

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

@@ -13,6 +13,7 @@

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

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

#include "ui/base/accessibility/accessible_view_state.h"

+#include "views/views_delegate.h"

#include "views/focus/focus_manager.h"

////////////////////////////////////////////////////////////////////////////////

@@ -157,7 +158,8 @@ gfx::NativeViewAccessible

// 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 NativeTabContentsContainerWin(container);

}