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

Unified Diff: ui/aura_shell/show_state_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/show_state_controller.h ('k') | ui/aura_shell/workspace/workspace.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura_shell/show_state_controller.cc
diff --git a/ui/aura_shell/show_state_controller.cc b/ui/aura_shell/show_state_controller.cc
index 39e8c71667996cc8a502a731a27cdfd5a8505788..06f904a27b655db8ef22a200464158ec36204493 100644
--- a/ui/aura_shell/show_state_controller.cc
+++ b/ui/aura_shell/show_state_controller.cc
@@ -6,7 +6,6 @@
#include "ui/aura/aura_constants.h"
#include "ui/aura/window.h"
-#include "ui/aura_shell/default_container_layout_manager.h"
#include "ui/aura_shell/property_util.h"
#include "ui/aura_shell/workspace/workspace.h"
#include "ui/aura_shell/workspace/workspace_manager.h"
@@ -16,8 +15,8 @@ namespace aura_shell {
namespace internal {
ShowStateController::ShowStateController(
- DefaultContainerLayoutManager* layout_manager)
- : layout_manager_(layout_manager) {
+ WorkspaceManager* workspace_manager)
+ : workspace_manager_(workspace_manager) {
}
ShowStateController::~ShowStateController() {
@@ -41,9 +40,7 @@ void ShowStateController::OnPropertyChanged(aura::Window* window,
SetRestoreBounds(window, window->GetTargetBounds());
}
- layout_manager_->set_ignore_calculate_bounds(true);
- layout_manager_->workspace_manager()->FindBy(window)->Layout(NULL, window);
- layout_manager_->set_ignore_calculate_bounds(false);
+ workspace_manager_->FindBy(window)->Layout(NULL, window);
}
} // namespace internal
« no previous file with comments | « ui/aura_shell/show_state_controller.h ('k') | ui/aura_shell/workspace/workspace.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698