diff options
3 files changed, 9 insertions, 3 deletions
diff --git a/chrome/browser/ui/views/frame/browser_frame_win.cc b/chrome/browser/ui/views/frame/browser_frame_win.cc index 2b344c6..b641f35 100644 --- a/chrome/browser/ui/views/frame/browser_frame_win.cc +++ b/chrome/browser/ui/views/frame/browser_frame_win.cc @@ -17,6 +17,7 @@ #include "ui/base/theme_provider.h" #include "ui/gfx/font.h" #include "views/screen.h" +#include "views/views_delegate.h" #include "views/widget/native_widget_win.h" #include "views/widget/widget.h" #include "views/window/non_client_view.h" @@ -217,7 +218,8 @@ const gfx::Font& BrowserFrame::GetTitleFont() { NativeBrowserFrame* NativeBrowserFrame::CreateNativeBrowserFrame( BrowserFrame* browser_frame, BrowserView* browser_view) { - if (views::Widget::IsPureViews()) + if (views::Widget::IsPureViews() && + views::ViewsDelegate::views_delegate->GetDefaultParentView()) return new BrowserFrameViews(browser_frame, browser_view); return new BrowserFrameWin(browser_frame, browser_view); } 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 163d59d..eea285c 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); } diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.cc b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.cc index a1550c0..2ef8e42 100644 --- a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.cc +++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.cc @@ -11,6 +11,7 @@ #include "chrome/browser/ui/views/tab_contents/tab_contents_drag_win.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_view.h" +#include "views/views_delegate.h" #include "views/widget/widget.h" namespace { @@ -342,7 +343,8 @@ bool NativeTabContentsViewWin::ScrollZoom(int scroll_type) { // 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 NativeTabContentsViewWin(delegate); } |