| 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/trace_event/trace_event.h" | 8 #include "base/trace_event/trace_event.h" |
| 9 #include "ui/aura/client/aura_constants.h" | 9 #include "ui/aura/client/aura_constants.h" |
| 10 #include "ui/aura/client/cursor_client.h" | 10 #include "ui/aura/client/cursor_client.h" |
| (...skipping 702 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 713 gfx::ScaleToEnclosingRect(bounds, scale, scale); | 713 gfx::ScaleToEnclosingRect(bounds, scale, scale); |
| 714 desktop_window_tree_host_->AsWindowTreeHost()->SetBounds(bounds_in_pixels); | 714 desktop_window_tree_host_->AsWindowTreeHost()->SetBounds(bounds_in_pixels); |
| 715 } | 715 } |
| 716 | 716 |
| 717 void DesktopNativeWidgetAura::SetSize(const gfx::Size& size) { | 717 void DesktopNativeWidgetAura::SetSize(const gfx::Size& size) { |
| 718 if (content_window_) | 718 if (content_window_) |
| 719 desktop_window_tree_host_->SetSize(size); | 719 desktop_window_tree_host_->SetSize(size); |
| 720 } | 720 } |
| 721 | 721 |
| 722 void DesktopNativeWidgetAura::StackAbove(gfx::NativeView native_view) { | 722 void DesktopNativeWidgetAura::StackAbove(gfx::NativeView native_view) { |
| 723 if (content_window_) |
| 724 desktop_window_tree_host_->StackAbove(native_view); |
| 723 } | 725 } |
| 724 | 726 |
| 725 void DesktopNativeWidgetAura::StackAtTop() { | 727 void DesktopNativeWidgetAura::StackAtTop() { |
| 726 if (content_window_) | 728 if (content_window_) |
| 727 desktop_window_tree_host_->StackAtTop(); | 729 desktop_window_tree_host_->StackAtTop(); |
| 728 } | 730 } |
| 729 | 731 |
| 730 void DesktopNativeWidgetAura::StackBelow(gfx::NativeView native_view) { | 732 void DesktopNativeWidgetAura::StackBelow(gfx::NativeView native_view) { |
| 731 } | 733 } |
| 732 | 734 |
| (...skipping 512 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1245 if (cursor_reference_count_ == 0) { | 1247 if (cursor_reference_count_ == 0) { |
| 1246 // We are the last DesktopNativeWidgetAura instance, and we are responsible | 1248 // We are the last DesktopNativeWidgetAura instance, and we are responsible |
| 1247 // for cleaning up |cursor_manager_|. | 1249 // for cleaning up |cursor_manager_|. |
| 1248 delete cursor_manager_; | 1250 delete cursor_manager_; |
| 1249 native_cursor_manager_ = NULL; | 1251 native_cursor_manager_ = NULL; |
| 1250 cursor_manager_ = NULL; | 1252 cursor_manager_ = NULL; |
| 1251 } | 1253 } |
| 1252 } | 1254 } |
| 1253 | 1255 |
| 1254 } // namespace views | 1256 } // namespace views |
| OLD | NEW |