OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ui/views/widget/native_widget_aura.h" | 5 #include "ui/views/widget/native_widget_aura.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/string_util.h" | 8 #include "base/string_util.h" |
9 #include "third_party/skia/include/core/SkRegion.h" | 9 #include "third_party/skia/include/core/SkRegion.h" |
10 #include "ui/aura/client/activation_client.h" | 10 #include "ui/aura/client/activation_client.h" |
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
224 #endif // !defined(OS_MACOSX) | 224 #endif // !defined(OS_MACOSX) |
225 | 225 |
226 drop_helper_.reset(new DropHelper(GetWidget()->GetRootView())); | 226 drop_helper_.reset(new DropHelper(GetWidget()->GetRootView())); |
227 if (params.type != Widget::InitParams::TYPE_TOOLTIP && | 227 if (params.type != Widget::InitParams::TYPE_TOOLTIP && |
228 params.type != Widget::InitParams::TYPE_POPUP) { | 228 params.type != Widget::InitParams::TYPE_POPUP) { |
229 aura::client::SetDragDropDelegate(window_, this); | 229 aura::client::SetDragDropDelegate(window_, this); |
230 } | 230 } |
231 | 231 |
232 aura::client::SetActivationDelegate(window_, this); | 232 aura::client::SetActivationDelegate(window_, this); |
233 | 233 |
234 // TODO(erg): Move this somewhere else? | 234 if (desktop_helper_.get()) { |
235 if (desktop_helper_.get()) | 235 desktop_helper_->PostInitialize(); |
| 236 // TODO(erg): Move this somewhere else? |
236 desktop_helper_->ShowRootWindow(); | 237 desktop_helper_->ShowRootWindow(); |
| 238 } |
237 } | 239 } |
238 | 240 |
239 NonClientFrameView* NativeWidgetAura::CreateNonClientFrameView() { | 241 NonClientFrameView* NativeWidgetAura::CreateNonClientFrameView() { |
240 return NULL; | 242 return NULL; |
241 } | 243 } |
242 | 244 |
243 void NativeWidgetAura::UpdateFrameAfterFrameChange() { | 245 void NativeWidgetAura::UpdateFrameAfterFrameChange() { |
244 } | 246 } |
245 | 247 |
246 bool NativeWidgetAura::ShouldUseNativeFrame() const { | 248 bool NativeWidgetAura::ShouldUseNativeFrame() const { |
(...skipping 717 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
964 } | 966 } |
965 } | 967 } |
966 | 968 |
967 // static | 969 // static |
968 bool NativeWidgetPrivate::IsMouseButtonDown() { | 970 bool NativeWidgetPrivate::IsMouseButtonDown() { |
969 return aura::Env::GetInstance()->is_mouse_button_down(); | 971 return aura::Env::GetInstance()->is_mouse_button_down(); |
970 } | 972 } |
971 | 973 |
972 } // namespace internal | 974 } // namespace internal |
973 } // namespace views | 975 } // namespace views |
OLD | NEW |