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

Unified Diff: ui/aura_shell/workspace/workspace_controller.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/workspace/workspace_controller.h ('k') | ui/aura_shell/workspace/workspace_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura_shell/workspace/workspace_controller.cc
diff --git a/ui/aura_shell/workspace/workspace_controller.cc b/ui/aura_shell/workspace/workspace_controller.cc
index e17228b3aa4b21f1eabfca1fd54359acfbbc90cb..2c2a48fca388f410a94fb24743b840a8c5bce485 100644
--- a/ui/aura_shell/workspace/workspace_controller.cc
+++ b/ui/aura_shell/workspace/workspace_controller.cc
@@ -13,11 +13,8 @@
namespace aura_shell {
namespace internal {
-WorkspaceController::WorkspaceController(aura::Window* window)
- : workspace_manager_(new WorkspaceManager(window)),
- layout_manager_(new internal::DefaultContainerLayoutManager(
- window, workspace_manager_.get())) {
- window->SetLayoutManager(layout_manager_);
+WorkspaceController::WorkspaceController(aura::Window* viewport)
+ : workspace_manager_(new WorkspaceManager(viewport)) {
aura::Desktop::GetInstance()->AddObserver(this);
}
@@ -30,9 +27,7 @@ void WorkspaceController::ToggleOverview() {
}
void WorkspaceController::OnDesktopResized(const gfx::Size& new_size) {
- layout_manager_->set_ignore_calculate_bounds(true);
workspace_manager_->SetWorkspaceSize(new_size);
- layout_manager_->set_ignore_calculate_bounds(false);
}
void WorkspaceController::OnActiveWindowChanged(aura::Window* active) {
« no previous file with comments | « ui/aura_shell/workspace/workspace_controller.h ('k') | ui/aura_shell/workspace/workspace_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698