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

Unified Diff: athena/wm/split_view_controller.h

Issue 513313003: Fix crash when using title drag on a window opened while split view is active (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 | « no previous file | athena/wm/split_view_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/wm/split_view_controller.h
diff --git a/athena/wm/split_view_controller.h b/athena/wm/split_view_controller.h
index d0e70735e3899f6d892cf028048dddc985ee249e..56c33c720ff3c954869f9f68d88d44795c25344f 100644
--- a/athena/wm/split_view_controller.h
+++ b/athena/wm/split_view_controller.h
@@ -35,11 +35,12 @@ class ATHENA_EXPORT SplitViewController
// |left| nor |right|) is selected instead.
void ActivateSplitMode(aura::Window* left, aura::Window* right);
- // Resets the internal state to an inactive state. Calling this does not
- // change the window bounds/transforms etc. The caller must take care of
- // making any necessary changes.
+ // Resets the internal state to an inactive state.
void DeactivateSplitMode();
+ // Replaces |window| in split-view mode with |replace_with|. Adjusts
+ // |replace_with|'s visibility, transform and bounds. Resets |window|'s
+ // visibility and transform but does not change its bounds.
void ReplaceWindow(aura::Window* window,
aura::Window* replace_with);
@@ -69,11 +70,12 @@ class ATHENA_EXPORT SplitViewController
void UpdateLayout(bool animate);
- void SetWindowTransform(aura::Window* left_window,
- const gfx::Transform& transform,
- bool animate);
+ void SetWindowTransforms(const gfx::Transform& left_transform,
+ const gfx::Transform& right_transform,
+ bool animate);
- void OnAnimationCompleted(aura::Window* window);
+ // Called when the animation initiated by SetWindowTransforms() completes.
+ void OnAnimationCompleted();
void UpdateSeparatorPositionFromScrollDelta(float delta);
« no previous file with comments | « no previous file | athena/wm/split_view_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698