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

Unified Diff: ui/aura_shell/default_container_layout_manager.h

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/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 cd4421cfdfecb9cda3243cc74f8ad27652ae462f..50336c371572ca38da897347535784b0271c3acc 100644
--- a/ui/aura_shell/default_container_layout_manager.h
+++ b/ui/aura_shell/default_container_layout_manager.h
@@ -31,8 +31,7 @@ class WorkspaceManager;
class AURA_SHELL_EXPORT DefaultContainerLayoutManager
: public aura::LayoutManager {
public:
- DefaultContainerLayoutManager(aura::Window* owner,
- WorkspaceManager* workspace_manager);
+ explicit DefaultContainerLayoutManager(WorkspaceManager* workspace_manager);
virtual ~DefaultContainerLayoutManager();
// Returns the workspace manager for this container.
@@ -55,13 +54,6 @@ class AURA_SHELL_EXPORT DefaultContainerLayoutManager
// Invoked when a user finished resizing window.
void EndResize(aura::Window* drag, aura::MouseEvent* evnet);
- // 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;
- }
-
// Overridden from aura::LayoutManager:
virtual void OnWindowResized() OVERRIDE;
virtual void OnWindowAdded(aura::Window* child) OVERRIDE;
@@ -71,19 +63,13 @@ class AURA_SHELL_EXPORT DefaultContainerLayoutManager
virtual void SetChildBounds(aura::Window* child,
const gfx::Rect& requested_bounds) OVERRIDE;
private:
- aura::Window* owner_;
-
+ // Owned by WorkspaceController.
WorkspaceManager* workspace_manager_;
// A window that are currently moved or resized. Used to put
// different constraints on drag window.
aura::Window* drag_window_;
- // A flag to control layout behavior. This is set to true while
- // workspace manager is laying out children and LayoutManager
- // 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