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

Unified Diff: ui/aura_shell/show_state_controller.cc

Issue 8400063: Move maximize/fullscreen/restore to shell (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove OVERRIDE from .cc Created 9 years, 2 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 | « ui/aura_shell/show_state_controller.h ('k') | ui/aura_shell/workspace/workspace.h » ('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
new file mode 100644
index 0000000000000000000000000000000000000000..39e8c71667996cc8a502a731a27cdfd5a8505788
--- /dev/null
+++ b/ui/aura_shell/show_state_controller.cc
@@ -0,0 +1,50 @@
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "ui/aura_shell/show_state_controller.h"
+
+#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"
+#include "ui/base/ui_base_types.h"
+
+namespace aura_shell {
+namespace internal {
+
+ShowStateController::ShowStateController(
+ DefaultContainerLayoutManager* layout_manager)
+ : layout_manager_(layout_manager) {
+}
+
+ShowStateController::~ShowStateController() {
+}
+
+void ShowStateController::OnPropertyChanged(aura::Window* window,
+ const char* name,
+ void* old) {
+ if (name != aura::kShowStateKey)
+ return;
+ if (window->GetIntProperty(name) == ui::SHOW_STATE_NORMAL) {
+ // Restore the size of window first, then let Workspace layout the window.
+ const gfx::Rect* restore = GetRestoreBounds(window);
+ window->SetProperty(aura::kRestoreBoundsKey, NULL);
+ if (restore)
+ window->SetBounds(*restore);
+ delete restore;
+ } else if (old == reinterpret_cast<void*>(ui::SHOW_STATE_NORMAL)) {
+ // Store the restore bounds only if previous state is normal.
+ DCHECK(window->GetProperty(aura::kRestoreBoundsKey) == NULL);
+ 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);
+}
+
+} // namespace internal
+} // namespace aura_shell
« no previous file with comments | « ui/aura_shell/show_state_controller.h ('k') | ui/aura_shell/workspace/workspace.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698