Chromium Code Reviews| Index: ui/views/widget/desktop_aura/desktop_native_widget_aura.cc |
| diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc |
| index d7347d008257c90ea2aa568c9c466cebf935ec6e..63fffd5e92b842a702cff5297b8c49b435af317f 100644 |
| --- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc |
| +++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc |
| @@ -45,6 +45,7 @@ |
| #include "ui/views/widget/widget_aura_utils.h" |
| #include "ui/views/widget/widget_delegate.h" |
| #include "ui/views/widget/window_reorderer.h" |
| +#include "ui/views/window/native_frame_view.h" |
| #include "ui/wm/core/compound_event_filter.h" |
| #include "ui/wm/core/cursor_manager.h" |
| #include "ui/wm/core/focus_controller.h" |
| @@ -536,7 +537,8 @@ void DesktopNativeWidgetAura::InitNativeWidget( |
| } |
| NonClientFrameView* DesktopNativeWidgetAura::CreateNonClientFrameView() { |
| - return desktop_window_tree_host_->CreateNonClientFrameView(); |
| + return desktop_window_tree_host_->ShouldUseNativeFrame() ? |
|
Matt Giuca
2014/05/14 06:16:38
Can you just call ShouldUseNativeFrame instead of
|
| + new NativeFrameView(GetWidget()) : NULL; |
| } |
| bool DesktopNativeWidgetAura::ShouldUseNativeFrame() const { |