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

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

Issue 1923983003: Makes WorkspaceLayoutManager use ash/wm/common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix always-on-top and remove mus changes Created 4 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
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/wm/aura/wm_root_window_controller_aura.h" 5 #include "ash/wm/aura/wm_root_window_controller_aura.h"
6 6
7 #include "ash/display/window_tree_host_manager.h" 7 #include "ash/display/window_tree_host_manager.h"
8 #include "ash/root_window_controller.h" 8 #include "ash/root_window_controller.h"
9 #include "ash/shelf/shelf.h" 9 #include "ash/shelf/shelf.h"
10 #include "ash/shelf/shelf_widget.h" 10 #include "ash/shelf/shelf_widget.h"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 } 72 }
73 73
74 WmGlobals* WmRootWindowControllerAura::GetGlobals() { 74 WmGlobals* WmRootWindowControllerAura::GetGlobals() {
75 return WmGlobalsAura::Get(); 75 return WmGlobalsAura::Get();
76 } 76 }
77 77
78 WorkspaceWindowState WmRootWindowControllerAura::GetWorkspaceWindowState() { 78 WorkspaceWindowState WmRootWindowControllerAura::GetWorkspaceWindowState() {
79 return root_window_controller_->workspace_controller()->GetWindowState(); 79 return root_window_controller_->workspace_controller()->GetWindowState();
80 } 80 }
81 81
82 AlwaysOnTopController* WmRootWindowControllerAura::GetAlwaysOnTopController() {
83 return root_window_controller_->always_on_top_controller();
84 }
85
82 WmShelf* WmRootWindowControllerAura::GetShelf() { 86 WmShelf* WmRootWindowControllerAura::GetShelf() {
83 return root_window_controller_->shelf() 87 return root_window_controller_->shelf()
84 ? root_window_controller_->shelf()->shelf()->wm_shelf() 88 ? root_window_controller_->shelf()->shelf()->wm_shelf()
85 : nullptr; 89 : nullptr;
86 } 90 }
87 91
88 WmWindow* WmRootWindowControllerAura::GetWindow() { 92 WmWindow* WmRootWindowControllerAura::GetWindow() {
89 return WmWindowAura::Get(root_window_controller_->GetRootWindow()); 93 return WmWindowAura::Get(root_window_controller_->GetRootWindow());
90 } 94 }
91 95
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 aura::Window* root_window) { 130 aura::Window* root_window) {
127 if (root_window != root_window_controller_->GetRootWindow()) 131 if (root_window != root_window_controller_->GetRootWindow())
128 return; 132 return;
129 133
130 FOR_EACH_OBSERVER(WmRootWindowControllerObserver, observers_, 134 FOR_EACH_OBSERVER(WmRootWindowControllerObserver, observers_,
131 OnShelfAlignmentChanged()); 135 OnShelfAlignmentChanged());
132 } 136 }
133 137
134 } // namespace wm 138 } // namespace wm
135 } // namespace ash 139 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698