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

Unified Diff: ash/wm/aura/wm_root_window_controller_aura.cc

Issue 1914093002: Refactors DockedWindowLayoutManager in terms of ash/wm/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@nuke_aura_window
Patch Set: merge 2 trunk 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 side-by-side diff with in-line comments
Download patch
Index: ash/wm/aura/wm_root_window_controller_aura.cc
diff --git a/ash/wm/aura/wm_root_window_controller_aura.cc b/ash/wm/aura/wm_root_window_controller_aura.cc
index 8f099b5d96090775cb3a695a5e58fa3c84430116..9d5d8333cc591df6b998dcd49e27a3bbca5017d8 100644
--- a/ash/wm/aura/wm_root_window_controller_aura.cc
+++ b/ash/wm/aura/wm_root_window_controller_aura.cc
@@ -6,8 +6,11 @@
#include "ash/display/window_tree_host_manager.h"
#include "ash/root_window_controller.h"
+#include "ash/shelf/shelf.h"
+#include "ash/shelf/shelf_widget.h"
#include "ash/shell.h"
#include "ash/wm/aura/wm_globals_aura.h"
+#include "ash/wm/aura/wm_shelf_aura.h"
#include "ash/wm/aura/wm_window_aura.h"
#include "ash/wm/common/wm_root_window_controller_observer.h"
#include "ash/wm/workspace_controller.h"
@@ -76,6 +79,12 @@ WorkspaceWindowState WmRootWindowControllerAura::GetWorkspaceWindowState() {
return root_window_controller_->workspace_controller()->GetWindowState();
}
+WmShelf* WmRootWindowControllerAura::GetShelf() {
+ return root_window_controller_->shelf()
+ ? root_window_controller_->shelf()->shelf()->wm_shelf()
+ : nullptr;
+}
+
WmWindow* WmRootWindowControllerAura::GetWindow() {
return WmWindowAura::Get(root_window_controller_->GetRootWindow());
}

Powered by Google App Engine
This is Rietveld 408576698