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

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

Issue 1901773002: Removes most of aura dependencies from DefaultState (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@wm_window_positioner
Patch Set: nit and merge Created 4 years, 8 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/wm/aura/wm_root_window_controller_aura.h ('k') | ash/wm/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/wm/aura/wm_root_window_controller_aura.h" 5 #include "ash/wm/aura/wm_root_window_controller_aura.h"
6 6
7 #include "ash/root_window_controller.h" 7 #include "ash/root_window_controller.h"
8 #include "ash/wm/aura/wm_globals_aura.h" 8 #include "ash/wm/aura/wm_globals_aura.h"
9 #include "ash/wm/workspace_controller.h"
9 #include "ui/aura/window.h" 10 #include "ui/aura/window.h"
10 #include "ui/aura/window_property.h" 11 #include "ui/aura/window_property.h"
11 12
12 DECLARE_WINDOW_PROPERTY_TYPE(ash::wm::WmRootWindowControllerAura*); 13 DECLARE_WINDOW_PROPERTY_TYPE(ash::wm::WmRootWindowControllerAura*);
13 14
14 namespace ash { 15 namespace ash {
15 namespace wm { 16 namespace wm {
16 17
17 // TODO(sky): it likely makes more sense to hang this off RootWindowSettings. 18 // TODO(sky): it likely makes more sense to hang this off RootWindowSettings.
18 DEFINE_OWNED_WINDOW_PROPERTY_KEY(ash::wm::WmRootWindowControllerAura, 19 DEFINE_OWNED_WINDOW_PROPERTY_KEY(ash::wm::WmRootWindowControllerAura,
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 } 51 }
51 52
52 bool WmRootWindowControllerAura::HasShelf() { 53 bool WmRootWindowControllerAura::HasShelf() {
53 return root_window_controller_->shelf() != nullptr; 54 return root_window_controller_->shelf() != nullptr;
54 } 55 }
55 56
56 WmGlobals* WmRootWindowControllerAura::GetGlobals() { 57 WmGlobals* WmRootWindowControllerAura::GetGlobals() {
57 return WmGlobalsAura::Get(); 58 return WmGlobalsAura::Get();
58 } 59 }
59 60
61 WorkspaceWindowState WmRootWindowControllerAura::GetWorkspaceWindowState() {
62 return root_window_controller_->workspace_controller()->GetWindowState();
63 }
64
60 } // namespace wm 65 } // namespace wm
61 } // namespace ash 66 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/aura/wm_root_window_controller_aura.h ('k') | ash/wm/aura/wm_window_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698