Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(91)

Side by Side Diff: ui/views/widget/desktop_aura/desktop_native_widget_aura.cc

Issue 267593005: Refactor menu controller to isolate aura dependency. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to master. Fixes for tapted. Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/debug/trace_event.h" 8 #include "base/debug/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 818 matching lines...) Expand 10 before | Expand all | Expand 10 after
829 829
830 bool DesktopNativeWidgetAura::IsFullscreen() const { 830 bool DesktopNativeWidgetAura::IsFullscreen() const {
831 return content_window_ && desktop_window_tree_host_->IsFullscreen(); 831 return content_window_ && desktop_window_tree_host_->IsFullscreen();
832 } 832 }
833 833
834 void DesktopNativeWidgetAura::SetOpacity(unsigned char opacity) { 834 void DesktopNativeWidgetAura::SetOpacity(unsigned char opacity) {
835 if (content_window_) 835 if (content_window_)
836 desktop_window_tree_host_->SetOpacity(opacity); 836 desktop_window_tree_host_->SetOpacity(opacity);
837 } 837 }
838 838
839 void DesktopNativeWidgetAura::SetHasActivationShadow(bool has_shadow) {
840 if (content_window_)
841 SetShadowType(content_window_, has_shadow ? wm::SHADOW_TYPE_RECTANGULAR
842 : wm::SHADOW_TYPE_NONE);
843 }
844
839 void DesktopNativeWidgetAura::SetUseDragFrame(bool use_drag_frame) { 845 void DesktopNativeWidgetAura::SetUseDragFrame(bool use_drag_frame) {
840 } 846 }
841 847
842 void DesktopNativeWidgetAura::FlashFrame(bool flash_frame) { 848 void DesktopNativeWidgetAura::FlashFrame(bool flash_frame) {
843 if (content_window_) 849 if (content_window_)
844 desktop_window_tree_host_->FlashFrame(flash_frame); 850 desktop_window_tree_host_->FlashFrame(flash_frame);
845 } 851 }
846 852
847 void DesktopNativeWidgetAura::RunShellDrag( 853 void DesktopNativeWidgetAura::RunShellDrag(
848 View* view, 854 View* view,
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
1186 if (cursor_reference_count_ == 0) { 1192 if (cursor_reference_count_ == 0) {
1187 // We are the last DesktopNativeWidgetAura instance, and we are responsible 1193 // We are the last DesktopNativeWidgetAura instance, and we are responsible
1188 // for cleaning up |cursor_manager_|. 1194 // for cleaning up |cursor_manager_|.
1189 delete cursor_manager_; 1195 delete cursor_manager_;
1190 native_cursor_manager_ = NULL; 1196 native_cursor_manager_ = NULL;
1191 cursor_manager_ = NULL; 1197 cursor_manager_ = NULL;
1192 } 1198 }
1193 } 1199 }
1194 1200
1195 } // namespace views 1201 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698