| 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/desktop_aura/desktop_native_widget_aura.h" | 5 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "base/trace_event/trace_event.h" | 9 #include "base/trace_event/trace_event.h" |
| 10 #include "build/build_config.h" | 10 #include "build/build_config.h" |
| (...skipping 517 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 528 | 528 |
| 529 shadow_controller_.reset(new wm::ShadowController( | 529 shadow_controller_.reset(new wm::ShadowController( |
| 530 aura::client::GetActivationClient(host_->window()))); | 530 aura::client::GetActivationClient(host_->window()))); |
| 531 | 531 |
| 532 OnSizeConstraintsChanged(); | 532 OnSizeConstraintsChanged(); |
| 533 | 533 |
| 534 window_reorderer_.reset(new WindowReorderer(content_window_, | 534 window_reorderer_.reset(new WindowReorderer(content_window_, |
| 535 GetWidget()->GetRootView())); | 535 GetWidget()->GetRootView())); |
| 536 } | 536 } |
| 537 | 537 |
| 538 void DesktopNativeWidgetAura::OnWidgetInitDone() {} | 538 void DesktopNativeWidgetAura::OnWidgetInitDone() { |
| 539 desktop_window_tree_host_->OnNativeWidgetInitDone(); |
| 540 } |
| 539 | 541 |
| 540 NonClientFrameView* DesktopNativeWidgetAura::CreateNonClientFrameView() { | 542 NonClientFrameView* DesktopNativeWidgetAura::CreateNonClientFrameView() { |
| 541 return ShouldUseNativeFrame() ? new NativeFrameView(GetWidget()) : NULL; | 543 return ShouldUseNativeFrame() ? new NativeFrameView(GetWidget()) : NULL; |
| 542 } | 544 } |
| 543 | 545 |
| 544 bool DesktopNativeWidgetAura::ShouldUseNativeFrame() const { | 546 bool DesktopNativeWidgetAura::ShouldUseNativeFrame() const { |
| 545 return desktop_window_tree_host_->ShouldUseNativeFrame(); | 547 return desktop_window_tree_host_->ShouldUseNativeFrame(); |
| 546 } | 548 } |
| 547 | 549 |
| 548 bool DesktopNativeWidgetAura::ShouldWindowContentsBeTransparent() const { | 550 bool DesktopNativeWidgetAura::ShouldWindowContentsBeTransparent() const { |
| (...skipping 642 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1191 if (cursor_reference_count_ == 0) { | 1193 if (cursor_reference_count_ == 0) { |
| 1192 // We are the last DesktopNativeWidgetAura instance, and we are responsible | 1194 // We are the last DesktopNativeWidgetAura instance, and we are responsible |
| 1193 // for cleaning up |cursor_manager_|. | 1195 // for cleaning up |cursor_manager_|. |
| 1194 delete cursor_manager_; | 1196 delete cursor_manager_; |
| 1195 native_cursor_manager_ = NULL; | 1197 native_cursor_manager_ = NULL; |
| 1196 cursor_manager_ = NULL; | 1198 cursor_manager_ = NULL; |
| 1197 } | 1199 } |
| 1198 } | 1200 } |
| 1199 | 1201 |
| 1200 } // namespace views | 1202 } // namespace views |
| OLD | NEW |