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

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

Issue 263083005: Remove "Alternate frame caption button style" command line flag (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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/dock/docked_window_layout_manager.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 d62b135805bb2093ed91e7d0b3d48fecc7c2c505..11d6f952e3fa8fbb935a87186ae9f5edabee6607 100644
--- a/ash/wm/workspace/phantom_window_controller.h
+++ b/ash/wm/workspace/phantom_window_controller.h
@@ -30,52 +30,27 @@ class ASH_EXPORT PhantomWindowController {
// Hides the phantom window without any animation.
virtual ~PhantomWindowController();
- // Animates the phantom window towards |bounds_in_screen|. The animation used
- // depends on whether the alternate caption button style is used.
+ // Shows the phantom window and animates shrinking it to |bounds_in_screen|.
void Show(const gfx::Rect& bounds_in_screen);
- // 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;
- }
-
private:
friend class PhantomWindowControllerTest;
- // Animates the phantom window towards |bounds_in_screen| when the alternate
- // caption button style is used.
- void ShowAlternate(const gfx::Rect& bounds_in_screen);
-
- // Animates the phantom window towards |bounds_in_screen| when the legacy
- // caption button style is used.
- void ShowLegacy(const gfx::Rect& bounds_in_screen);
-
// Creates, shows and returns a phantom widget at |bounds|
// with kShellWindowId_ShelfContainer in |root_window| as a parent.
scoped_ptr<views::Widget> CreatePhantomWidget(
aura::Window* root_window,
const gfx::Rect& bounds_in_screen);
- // Window the phantom is placed beneath.
+ // Window that the phantom window is stacked above.
aura::Window* window_;
- // If set, the phantom window should get stacked below this window.
- aura::Window* phantom_below_window_;
-
// Target bounds (including the shadows if any) of the animation in screen
// coordinates.
gfx::Rect target_bounds_in_screen_;
- // Phantom representation of the window which is in the root window matching
- // |target_bounds_in_screen_|.
- scoped_ptr<views::Widget> phantom_widget_in_target_root_;
-
- // Phantom representation of the window which is in the root window matching
- // the window's initial bounds. This allows animations to progress from one
- // display to the other. NULL if the phantom window starts and ends in the
- // same root window. Not used when using the alternate caption button style.
- scoped_ptr<views::Widget> phantom_widget_in_start_root_;
+ // Phantom representation of the window.
+ scoped_ptr<views::Widget> phantom_widget_;
DISALLOW_COPY_AND_ASSIGN(PhantomWindowController);
};
« no previous file with comments | « ash/wm/dock/docked_window_layout_manager.cc ('k') | ash/wm/workspace/phantom_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698