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

Unified Diff: ash/root_window_controller.cc

Issue 1907863002: Converts DockedWindowLayoutManager to common ash/wm types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comment 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
« no previous file with comments | « ash/ash.gyp ('k') | ash/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/root_window_controller.cc
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index 12d433c839d1b0697e4aaf2f67235c8f8592b765..2b6a6213d78e39836a585ece87089bae03235015 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -33,6 +33,7 @@
#include "ash/touch/touch_hud_projection.h"
#include "ash/touch/touch_observer_hud.h"
#include "ash/wm/always_on_top_controller.h"
+#include "ash/wm/aura/aura_layout_manager_adapter.h"
#include "ash/wm/aura/wm_window_aura.h"
#include "ash/wm/common/workspace/workspace_layout_manager_delegate.h"
#include "ash/wm/dock/docked_window_layout_manager.h"
@@ -809,10 +810,11 @@ void RootWindowController::InitLayoutManagers() {
}
// Create Docked windows layout manager
- aura::Window* docked_container = GetContainer(kShellWindowId_DockedContainer);
+ wm::WmWindow* docked_container =
+ wm::WmWindowAura::Get(GetContainer(kShellWindowId_DockedContainer));
docked_layout_manager_ =
new DockedWindowLayoutManager(docked_container, workspace_controller());
- docked_container->SetLayoutManager(docked_layout_manager_);
+ docked_container->SetLayoutManager(base::WrapUnique(docked_layout_manager_));
// Installs SnapLayoutManager to containers who set the
// |kSnapsChildrenToPhysicalPixelBoundary| property.
« no previous file with comments | « ash/ash.gyp ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698