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

Unified Diff: ui/aura_shell/shell.cc

Issue 8430024: Add WorkspaceObserver to observe changes in workspace state (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: update comments Created 9 years, 1 month 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 | « ui/aura_shell/default_container_layout_manager_unittest.cc ('k') | ui/aura_shell/show_state_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura_shell/shell.cc
diff --git a/ui/aura_shell/shell.cc b/ui/aura_shell/shell.cc
index 81f5a09b8c81aa26a3f180f066f2daefe8a46a12..358f29bd5248471531b2850f0da77a83cb39cb5f 100644
--- a/ui/aura_shell/shell.cc
+++ b/ui/aura_shell/shell.cc
@@ -11,6 +11,7 @@
#include "ui/aura/window.h"
#include "ui/aura/window_types.h"
#include "ui/aura_shell/default_container_event_filter.h"
+#include "ui/aura_shell/default_container_layout_manager.h"
#include "ui/aura_shell/desktop_layout_manager.h"
#include "ui/aura_shell/launcher/launcher.h"
#include "ui/aura_shell/shell_delegate.h"
@@ -127,6 +128,9 @@ void Shell::Init() {
workspace_controller_.reset(
new internal::WorkspaceController(toplevel_container));
+ toplevel_container->SetLayoutManager(
+ new internal::DefaultContainerLayoutManager(
+ workspace_controller_->workspace_manager()));
// Force a layout.
desktop_layout->OnWindowResized();
« no previous file with comments | « ui/aura_shell/default_container_layout_manager_unittest.cc ('k') | ui/aura_shell/show_state_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698