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

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

Issue 2576533003: Converts some services to use aura-mus (Closed)
Patch Set: remove log Created 4 years 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
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/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 519 matching lines...) Expand 10 before | Expand all | Expand 10 after
530 530
531 shadow_controller_.reset(new wm::ShadowController( 531 shadow_controller_.reset(new wm::ShadowController(
532 aura::client::GetActivationClient(host_->window()))); 532 aura::client::GetActivationClient(host_->window())));
533 533
534 OnSizeConstraintsChanged(); 534 OnSizeConstraintsChanged();
535 535
536 window_reorderer_.reset(new WindowReorderer(content_window_, 536 window_reorderer_.reset(new WindowReorderer(content_window_,
537 GetWidget()->GetRootView())); 537 GetWidget()->GetRootView()));
538 } 538 }
539 539
540 void DesktopNativeWidgetAura::OnWidgetInitDone() {} 540 void DesktopNativeWidgetAura::OnWidgetInitDone() {
541 desktop_window_tree_host_->OnWidgetInitDone();
542 }
541 543
542 NonClientFrameView* DesktopNativeWidgetAura::CreateNonClientFrameView() { 544 NonClientFrameView* DesktopNativeWidgetAura::CreateNonClientFrameView() {
543 return desktop_window_tree_host_->CreateNonClientFrameView(); 545 return desktop_window_tree_host_->CreateNonClientFrameView();
544 } 546 }
545 547
546 bool DesktopNativeWidgetAura::ShouldUseNativeFrame() const { 548 bool DesktopNativeWidgetAura::ShouldUseNativeFrame() const {
547 return desktop_window_tree_host_->ShouldUseNativeFrame(); 549 return desktop_window_tree_host_->ShouldUseNativeFrame();
548 } 550 }
549 551
550 bool DesktopNativeWidgetAura::ShouldWindowContentsBeTransparent() const { 552 bool DesktopNativeWidgetAura::ShouldWindowContentsBeTransparent() const {
(...skipping 651 matching lines...) Expand 10 before | Expand all | Expand 10 after
1202 if (cursor_reference_count_ == 0) { 1204 if (cursor_reference_count_ == 0) {
1203 // We are the last DesktopNativeWidgetAura instance, and we are responsible 1205 // We are the last DesktopNativeWidgetAura instance, and we are responsible
1204 // for cleaning up |cursor_manager_|. 1206 // for cleaning up |cursor_manager_|.
1205 delete cursor_manager_; 1207 delete cursor_manager_;
1206 native_cursor_manager_ = NULL; 1208 native_cursor_manager_ = NULL;
1207 cursor_manager_ = NULL; 1209 cursor_manager_ = NULL;
1208 } 1210 }
1209 } 1211 }
1210 1212
1211 } // namespace views 1213 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_native_widget_aura.h ('k') | ui/views/widget/desktop_aura/desktop_window_tree_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698