| 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 802 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 813 | 813 |
| 814 void DesktopNativeWidgetAura::SetFullscreen(bool fullscreen) { | 814 void DesktopNativeWidgetAura::SetFullscreen(bool fullscreen) { |
| 815 if (content_window_) | 815 if (content_window_) |
| 816 desktop_window_tree_host_->SetFullscreen(fullscreen); | 816 desktop_window_tree_host_->SetFullscreen(fullscreen); |
| 817 } | 817 } |
| 818 | 818 |
| 819 bool DesktopNativeWidgetAura::IsFullscreen() const { | 819 bool DesktopNativeWidgetAura::IsFullscreen() const { |
| 820 return content_window_ && desktop_window_tree_host_->IsFullscreen(); | 820 return content_window_ && desktop_window_tree_host_->IsFullscreen(); |
| 821 } | 821 } |
| 822 | 822 |
| 823 void DesktopNativeWidgetAura::SetOpacity(unsigned char opacity) { | 823 void DesktopNativeWidgetAura::SetOpacity(float opacity) { |
| 824 if (content_window_) | 824 if (content_window_) |
| 825 desktop_window_tree_host_->SetOpacity(opacity); | 825 desktop_window_tree_host_->SetOpacity(opacity); |
| 826 } | 826 } |
| 827 | 827 |
| 828 void DesktopNativeWidgetAura::FlashFrame(bool flash_frame) { | 828 void DesktopNativeWidgetAura::FlashFrame(bool flash_frame) { |
| 829 if (content_window_) | 829 if (content_window_) |
| 830 desktop_window_tree_host_->FlashFrame(flash_frame); | 830 desktop_window_tree_host_->FlashFrame(flash_frame); |
| 831 } | 831 } |
| 832 | 832 |
| 833 void DesktopNativeWidgetAura::RunShellDrag( | 833 void DesktopNativeWidgetAura::RunShellDrag( |
| (...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1191 if (cursor_reference_count_ == 0) { | 1191 if (cursor_reference_count_ == 0) { |
| 1192 // We are the last DesktopNativeWidgetAura instance, and we are responsible | 1192 // We are the last DesktopNativeWidgetAura instance, and we are responsible |
| 1193 // for cleaning up |cursor_manager_|. | 1193 // for cleaning up |cursor_manager_|. |
| 1194 delete cursor_manager_; | 1194 delete cursor_manager_; |
| 1195 native_cursor_manager_ = NULL; | 1195 native_cursor_manager_ = NULL; |
| 1196 cursor_manager_ = NULL; | 1196 cursor_manager_ = NULL; |
| 1197 } | 1197 } |
| 1198 } | 1198 } |
| 1199 | 1199 |
| 1200 } // namespace views | 1200 } // namespace views |
| OLD | NEW |