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

Unified Diff: ash/wm/workspace/phantom_window_controller.h

Issue 10823025: Adding new maximize menu according to spec (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: git try Created 8 years, 4 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 | « ash/wm/workspace/frame_maximize_button.cc ('k') | ash/wm/workspace/phantom_window_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace/phantom_window_controller.h
diff --git a/ash/wm/workspace/phantom_window_controller.h b/ash/wm/workspace/phantom_window_controller.h
index 5510fc262bd6c71c70a1340d4f9348d422e0616f..7ea76c41012e6f2089347baa74d8a6cbacacef90 100644
--- a/ash/wm/workspace/phantom_window_controller.h
+++ b/ash/wm/workspace/phantom_window_controller.h
@@ -50,6 +50,12 @@ class ASH_EXPORT PhantomWindowController : public ui::AnimationDelegate {
// Returns true if the phantom is showing.
bool IsShowing() const;
+ // If set, the phantom window is stacked below this window, otherwise it
+ // is stacked above the window passed to the constructor.
+ void set_phantom_below_window(aura::Window* phantom_below_window) {
+ phantom_below_window_ = phantom_below_window;
+ }
+
// ui::AnimationDelegate overrides:
virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
@@ -60,6 +66,9 @@ class ASH_EXPORT PhantomWindowController : public ui::AnimationDelegate {
// Window the phantom is placed beneath.
aura::Window* window_;
+ // If set, the phantom window should get stacked below this window.
+ aura::Window* phantom_below_window_;
+
// Initially the bounds of |window_|. Each time Show() is invoked
// |start_bounds_| is then reset to the bounds of |phantom_widget_| and
// |bounds_| is set to the value passed into Show(). The animation animates
@@ -67,7 +76,7 @@ class ASH_EXPORT PhantomWindowController : public ui::AnimationDelegate {
gfx::Rect start_bounds_;
gfx::Rect bounds_;
- scoped_ptr<views::Widget> phantom_widget_;
+ views::Widget* phantom_widget_;
// Used to transition the bounds.
scoped_ptr<ui::SlideAnimation> animation_;
« no previous file with comments | « ash/wm/workspace/frame_maximize_button.cc ('k') | ash/wm/workspace/phantom_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698