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

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 and merge with http://crrev.com/269819 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 826 matching lines...) Expand 10 before | Expand all | Expand 10 after
837 837
838 bool DesktopNativeWidgetAura::IsFullscreen() const { 838 bool DesktopNativeWidgetAura::IsFullscreen() const {
839 return content_window_ && desktop_window_tree_host_->IsFullscreen(); 839 return content_window_ && desktop_window_tree_host_->IsFullscreen();
840 } 840 }
841 841
842 void DesktopNativeWidgetAura::SetOpacity(unsigned char opacity) { 842 void DesktopNativeWidgetAura::SetOpacity(unsigned char opacity) {
843 if (content_window_) 843 if (content_window_)
844 desktop_window_tree_host_->SetOpacity(opacity); 844 desktop_window_tree_host_->SetOpacity(opacity);
845 } 845 }
846 846
847 void DesktopNativeWidgetAura::SetHasActivationShadow(bool has_shadow) {
848 if (content_window_)
849 SetShadowType(content_window_, has_shadow ? wm::SHADOW_TYPE_RECTANGULAR
850 : wm::SHADOW_TYPE_NONE);
851 }
852
847 void DesktopNativeWidgetAura::SetUseDragFrame(bool use_drag_frame) { 853 void DesktopNativeWidgetAura::SetUseDragFrame(bool use_drag_frame) {
848 } 854 }
849 855
850 void DesktopNativeWidgetAura::FlashFrame(bool flash_frame) { 856 void DesktopNativeWidgetAura::FlashFrame(bool flash_frame) {
851 if (content_window_) 857 if (content_window_)
852 desktop_window_tree_host_->FlashFrame(flash_frame); 858 desktop_window_tree_host_->FlashFrame(flash_frame);
853 } 859 }
854 860
855 void DesktopNativeWidgetAura::RunShellDrag( 861 void DesktopNativeWidgetAura::RunShellDrag(
856 View* view, 862 View* view,
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
1194 if (cursor_reference_count_ == 0) { 1200 if (cursor_reference_count_ == 0) {
1195 // We are the last DesktopNativeWidgetAura instance, and we are responsible 1201 // We are the last DesktopNativeWidgetAura instance, and we are responsible
1196 // for cleaning up |cursor_manager_|. 1202 // for cleaning up |cursor_manager_|.
1197 delete cursor_manager_; 1203 delete cursor_manager_;
1198 native_cursor_manager_ = NULL; 1204 native_cursor_manager_ = NULL;
1199 cursor_manager_ = NULL; 1205 cursor_manager_ = NULL;
1200 } 1206 }
1201 } 1207 }
1202 1208
1203 } // namespace views 1209 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698