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

Unified Diff: ash/wm/overview/scoped_transform_overview_window.h

Issue 844763006: Change overview mode to so that docked panel windows are not grouped together. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed stale pointer in ScopedTransformOverviewWindow. Created 5 years, 11 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
Index: ash/wm/overview/scoped_transform_overview_window.h
diff --git a/ash/wm/overview/scoped_transform_overview_window.h b/ash/wm/overview/scoped_transform_overview_window.h
index daa25deeb57295fac2caf025029a51dd0264f815..99ad65896d59e6b31429f7cc601e7cc2536bb0bc 100644
--- a/ash/wm/overview/scoped_transform_overview_window.h
+++ b/ash/wm/overview/scoped_transform_overview_window.h
@@ -63,7 +63,6 @@ class ScopedTransformOverviewWindow
return activate_button_.get();
}
-
// Starts an animation sequence which will use animation settings specified by
// |animation_type|. The |animation_settings| container is populated with
// scoped entities and the container should be destroyed at the end of the
@@ -89,16 +88,15 @@ class ScopedTransformOverviewWindow
// Returns the original target bounds of all transformed windows.
gfx::Rect GetTargetBoundsInScreen() const;
- // Restores the window if it was minimized.
+ // Restores and animates the managed window to it's non overview mode state.
void RestoreWindow();
- // Restores this window on exit rather than returning it to a minimized state
- // if it was minimized on entering overview mode.
- void RestoreWindowOnExit();
+ // Forces the managed window to be shown (ie not hidden or minimized) when
+ // calling RestoreWindow().
+ void ShowWindowOnExit();
// Informs the ScopedTransformOverviewWindow that the window being watched was
- // destroyed. This resets the internal window pointer to avoid calling
- // anything on the window at destruction time.
+ // destroyed. This resets the internal window pointer.
void OnWindowDestroyed();
// Prepares for overview mode by doing any necessary actions before entering.
@@ -121,6 +119,9 @@ class ScopedTransformOverviewWindow
void Select() override;
private:
+ // Shows the window if it was minimized.
+ void ShowWindowIfMinimized();
+
// A weak pointer to the real window in the overview.
aura::Window* window_;
« no previous file with comments | « ash/wm/maximize_mode/maximize_mode_window_manager.cc ('k') | ash/wm/overview/scoped_transform_overview_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698