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

Side by Side Diff: ash/aura/wm_root_window_controller_aura.cc

Issue 2350953009: Centralizes more shared code between ash and mash (Closed)
Patch Set: feedback Created 4 years, 3 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
« no previous file with comments | « ash/aura/wm_root_window_controller_aura.h ('k') | ash/aura/wm_window_aura.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "ash/aura/wm_root_window_controller_aura.h" 5 #include "ash/aura/wm_root_window_controller_aura.h"
6 6
7 #include "ash/aura/wm_shelf_aura.h" 7 #include "ash/aura/wm_shelf_aura.h"
8 #include "ash/aura/wm_shell_aura.h" 8 #include "ash/aura/wm_shell_aura.h"
9 #include "ash/aura/wm_window_aura.h" 9 #include "ash/aura/wm_window_aura.h"
10 #include "ash/common/shelf/shelf_widget.h" 10 #include "ash/common/shelf/shelf_widget.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 } 60 }
61 61
62 bool WmRootWindowControllerAura::HasShelf() { 62 bool WmRootWindowControllerAura::HasShelf() {
63 return root_window_controller_->wm_shelf_aura()->shelf_widget() != nullptr; 63 return root_window_controller_->wm_shelf_aura()->shelf_widget() != nullptr;
64 } 64 }
65 65
66 WmShell* WmRootWindowControllerAura::GetShell() { 66 WmShell* WmRootWindowControllerAura::GetShell() {
67 return WmShell::Get(); 67 return WmShell::Get();
68 } 68 }
69 69
70 AlwaysOnTopController* WmRootWindowControllerAura::GetAlwaysOnTopController() {
71 return root_window_controller_->always_on_top_controller();
72 }
73
74 WmShelf* WmRootWindowControllerAura::GetShelf() { 70 WmShelf* WmRootWindowControllerAura::GetShelf() {
75 return root_window_controller_->wm_shelf_aura(); 71 return root_window_controller_->wm_shelf_aura();
76 } 72 }
77 73
78 WmWindow* WmRootWindowControllerAura::GetWindow() { 74 WmWindow* WmRootWindowControllerAura::GetWindow() {
79 return WmWindowAura::Get(root_window_controller_->GetRootWindow()); 75 return WmWindowAura::Get(root_window_controller_->GetRootWindow());
80 } 76 }
81 77
82 void WmRootWindowControllerAura::ConfigureWidgetInitParamsForContainer( 78 void WmRootWindowControllerAura::ConfigureWidgetInitParamsForContainer(
83 views::Widget* widget, 79 views::Widget* widget,
(...skipping 27 matching lines...) Expand all
111 root_window_controller_->OnInitialWallpaperAnimationStarted(); 107 root_window_controller_->OnInitialWallpaperAnimationStarted();
112 WmRootWindowController::OnInitialWallpaperAnimationStarted(); 108 WmRootWindowController::OnInitialWallpaperAnimationStarted();
113 } 109 }
114 110
115 void WmRootWindowControllerAura::OnWallpaperAnimationFinished( 111 void WmRootWindowControllerAura::OnWallpaperAnimationFinished(
116 views::Widget* widget) { 112 views::Widget* widget) {
117 root_window_controller_->OnWallpaperAnimationFinished(widget); 113 root_window_controller_->OnWallpaperAnimationFinished(widget);
118 WmRootWindowController::OnWallpaperAnimationFinished(widget); 114 WmRootWindowController::OnWallpaperAnimationFinished(widget);
119 } 115 }
120 116
117 bool WmRootWindowControllerAura::ShouldDestroyWindowInCloseChildWindows(
118 WmWindow* window) {
119 return WmWindowAura::GetAuraWindow(window)->owned_by_parent();
120 }
121
121 } // namespace ash 122 } // namespace ash
OLDNEW
« no previous file with comments | « ash/aura/wm_root_window_controller_aura.h ('k') | ash/aura/wm_window_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698