| 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 671 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 682 void DesktopNativeWidgetAura::StackAbove(gfx::NativeView native_view) { | 682 void DesktopNativeWidgetAura::StackAbove(gfx::NativeView native_view) { |
| 683 if (content_window_) | 683 if (content_window_) |
| 684 desktop_window_tree_host_->StackAbove(native_view); | 684 desktop_window_tree_host_->StackAbove(native_view); |
| 685 } | 685 } |
| 686 | 686 |
| 687 void DesktopNativeWidgetAura::StackAtTop() { | 687 void DesktopNativeWidgetAura::StackAtTop() { |
| 688 if (content_window_) | 688 if (content_window_) |
| 689 desktop_window_tree_host_->StackAtTop(); | 689 desktop_window_tree_host_->StackAtTop(); |
| 690 } | 690 } |
| 691 | 691 |
| 692 void DesktopNativeWidgetAura::StackBelow(gfx::NativeView native_view) { | |
| 693 } | |
| 694 | |
| 695 void DesktopNativeWidgetAura::SetShape(std::unique_ptr<SkRegion> shape) { | 692 void DesktopNativeWidgetAura::SetShape(std::unique_ptr<SkRegion> shape) { |
| 696 if (content_window_) | 693 if (content_window_) |
| 697 desktop_window_tree_host_->SetShape(std::move(shape)); | 694 desktop_window_tree_host_->SetShape(std::move(shape)); |
| 698 } | 695 } |
| 699 | 696 |
| 700 void DesktopNativeWidgetAura::Close() { | 697 void DesktopNativeWidgetAura::Close() { |
| 701 if (!content_window_) | 698 if (!content_window_) |
| 702 return; | 699 return; |
| 703 | 700 |
| 704 content_window_->SuppressPaint(); | 701 content_window_->SuppressPaint(); |
| (...skipping 484 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1189 if (cursor_reference_count_ == 0) { | 1186 if (cursor_reference_count_ == 0) { |
| 1190 // We are the last DesktopNativeWidgetAura instance, and we are responsible | 1187 // We are the last DesktopNativeWidgetAura instance, and we are responsible |
| 1191 // for cleaning up |cursor_manager_|. | 1188 // for cleaning up |cursor_manager_|. |
| 1192 delete cursor_manager_; | 1189 delete cursor_manager_; |
| 1193 native_cursor_manager_ = NULL; | 1190 native_cursor_manager_ = NULL; |
| 1194 cursor_manager_ = NULL; | 1191 cursor_manager_ = NULL; |
| 1195 } | 1192 } |
| 1196 } | 1193 } |
| 1197 | 1194 |
| 1198 } // namespace views | 1195 } // namespace views |
| OLD | NEW |