Chromium Code Reviews| Index: ui/views/widget/widget.cc |
| diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc |
| index c8b82395f73daa9de5b0ce9c800698caeea88652..4ca8c6b314cefdb28a56173905b1fe4fe6d5dc97 100644 |
| --- a/ui/views/widget/widget.cc |
| +++ b/ui/views/widget/widget.cc |
| @@ -356,7 +356,6 @@ void Widget::Init(const InitParams& in_params) { |
| internal::NativeWidgetPrivate::IsMouseButtonDown(); |
| } |
| native_widget_->InitNativeWidget(params); |
| - observer_manager_.Add(GetNativeTheme()); |
| if (RequiresNonClientView(params.type)) { |
| non_client_view_ = new NonClientView; |
| non_client_view_->SetFrameView(CreateNonClientFrameView()); |
| @@ -378,6 +377,8 @@ void Widget::Init(const InitParams& in_params) { |
| SetContentsView(params.delegate->GetContentsView()); |
| SetInitialBoundsForFramelessWindow(params.bounds); |
| } |
| + // This must come after SetContentsView(). See http://crbug.com/375545 |
|
sky
2014/06/18 03:24:09
Document why, I shouldn't have to chase down a bug
|
| + observer_manager_.Add(GetNativeTheme()); |
| native_widget_initialized_ = true; |
| } |