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

Unified Diff: ui/aura_shell/default_container_layout_manager.h

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/aura_shell.gyp ('k') | ui/aura_shell/default_container_layout_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura_shell/default_container_layout_manager.h
diff --git a/ui/aura_shell/default_container_layout_manager.h b/ui/aura_shell/default_container_layout_manager.h
index cf2fe9dbe1c6db20073cdf8eb7a9f92e01507176..cd4421cfdfecb9cda3243cc74f8ad27652ae462f 100644
--- a/ui/aura_shell/default_container_layout_manager.h
+++ b/ui/aura_shell/default_container_layout_manager.h
@@ -8,6 +8,7 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
+#include "base/memory/scoped_ptr.h"
#include "ui/aura/layout_manager.h"
#include "ui/aura_shell/aura_shell_export.h"
@@ -23,6 +24,7 @@ class Rect;
namespace aura_shell {
namespace internal {
+class ShowStateController;
class WorkspaceManager;
// LayoutManager for the default window container.
@@ -33,6 +35,11 @@ class AURA_SHELL_EXPORT DefaultContainerLayoutManager
WorkspaceManager* workspace_manager);
virtual ~DefaultContainerLayoutManager();
+ // Returns the workspace manager for this container.
+ WorkspaceManager* workspace_manager() {
+ return workspace_manager_;
+ }
+
// Invoked when a window receives drag event.
void PrepareForMoveOrResize(aura::Window* drag, aura::MouseEvent* event);
@@ -48,8 +55,9 @@ class AURA_SHELL_EXPORT DefaultContainerLayoutManager
// Invoked when a user finished resizing window.
void EndResize(aura::Window* drag, aura::MouseEvent* evnet);
- // If true, |CalculateBoundsForChild| does nothing. Use in situations where
- // you want to circumvent what CalculateBoundsForChild() would normally do.
+ // If true, |SetChildBounds| does not modify the requested bounds.
+ // Use in situations where you want to circumvent what
+ // SetChildBounds() would normally do.
void set_ignore_calculate_bounds(bool value) {
ignore_calculate_bounds_ = value;
}
@@ -60,8 +68,8 @@ class AURA_SHELL_EXPORT DefaultContainerLayoutManager
virtual void OnWillRemoveWindow(aura::Window* child) OVERRIDE;
virtual void OnChildWindowVisibilityChanged(aura::Window* child,
bool visibile) OVERRIDE;
- virtual void CalculateBoundsForChild(aura::Window* child,
- gfx::Rect* requested_bounds) OVERRIDE;
+ virtual void SetChildBounds(aura::Window* child,
+ const gfx::Rect& requested_bounds) OVERRIDE;
private:
aura::Window* owner_;
@@ -76,6 +84,8 @@ class AURA_SHELL_EXPORT DefaultContainerLayoutManager
// ignores bounds check.
bool ignore_calculate_bounds_;
+ scoped_ptr<ShowStateController> show_state_controller_;
+
DISALLOW_COPY_AND_ASSIGN(DefaultContainerLayoutManager);
};
« no previous file with comments | « ui/aura_shell/aura_shell.gyp ('k') | ui/aura_shell/default_container_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698