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

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

Issue 2243513004: mash: Partially migrate WorkspaceController to ash common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments. Created 4 years, 4 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/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/wm/workspace/workspace_layout_manager_backdrop_delegate.h" 10 #include "ash/common/wm/workspace/workspace_layout_manager_backdrop_delegate.h"
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 69
70 bool WmRootWindowControllerAura::HasShelf() { 70 bool WmRootWindowControllerAura::HasShelf() {
71 return root_window_controller_->shelf_widget() != nullptr; 71 return root_window_controller_->shelf_widget() != nullptr;
72 } 72 }
73 73
74 WmShell* WmRootWindowControllerAura::GetShell() { 74 WmShell* WmRootWindowControllerAura::GetShell() {
75 return WmShell::Get(); 75 return WmShell::Get();
76 } 76 }
77 77
78 wm::WorkspaceWindowState WmRootWindowControllerAura::GetWorkspaceWindowState() { 78 wm::WorkspaceWindowState WmRootWindowControllerAura::GetWorkspaceWindowState() {
79 if (!root_window_controller_->workspace_controller())
80 return wm::WORKSPACE_WINDOW_STATE_DEFAULT;
79 return root_window_controller_->workspace_controller()->GetWindowState(); 81 return root_window_controller_->workspace_controller()->GetWindowState();
80 } 82 }
81 83
82 void WmRootWindowControllerAura::SetMaximizeBackdropDelegate( 84 void WmRootWindowControllerAura::SetMaximizeBackdropDelegate(
83 std::unique_ptr<WorkspaceLayoutManagerBackdropDelegate> delegate) { 85 std::unique_ptr<WorkspaceLayoutManagerBackdropDelegate> delegate) {
84 root_window_controller_->workspace_controller()->SetMaximizeBackdropDelegate( 86 root_window_controller_->workspace_controller()->SetMaximizeBackdropDelegate(
85 std::move(delegate)); 87 std::move(delegate));
86 } 88 }
87 89
88 AlwaysOnTopController* WmRootWindowControllerAura::GetAlwaysOnTopController() { 90 AlwaysOnTopController* WmRootWindowControllerAura::GetAlwaysOnTopController() {
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 const display::Display& display) {} 154 const display::Display& display) {}
153 155
154 void WmRootWindowControllerAura::OnDisplayMetricsChanged( 156 void WmRootWindowControllerAura::OnDisplayMetricsChanged(
155 const display::Display& display, 157 const display::Display& display,
156 uint32_t metrics) { 158 uint32_t metrics) {
157 FOR_EACH_OBSERVER(WmRootWindowControllerObserver, observers_, 159 FOR_EACH_OBSERVER(WmRootWindowControllerObserver, observers_,
158 OnWorkAreaChanged()); 160 OnWorkAreaChanged());
159 } 161 }
160 162
161 } // namespace ash 163 } // namespace ash
OLDNEW
« no previous file with comments | « ash/ash.gyp ('k') | ash/aura/wm_window_aura.cc » ('j') | ash/shelf/shelf_layout_manager.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698