Skip to content

Commit

Permalink
Fix -Wunusued-but-set-variable: /ash/wm/splitview
Browse files Browse the repository at this point in the history
This CL was uploaded by git cl split.

R=amusbach@chromium.org

Bug: 1203071
Change-Id: If4b9aab1326cde6403658443fe465b6892fa8444
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3217284
Auto-Submit: Peter Kasting <pkasting@chromium.org>
Reviewed-by: Avery Musbach <amusbach@chromium.org>
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/main@{#930714}
  • Loading branch information
pkasting authored and Chromium LUCI CQ committed Oct 12, 2021
1 parent db40e49 commit 28aef8f
Showing 1 changed file with 0 additions and 15 deletions.
15 changes: 0 additions & 15 deletions ash/wm/splitview/split_view_controller.cc
Original file line number Diff line number Diff line change
Expand Up @@ -880,7 +880,6 @@ void SplitViewController::AttachSnappingWindow(aura::Window* window,
OverviewSession* overview_session = GetOverviewSession();
RemoveSnappingWindowFromOverviewIfApplicable(overview_session, window);

bool do_divider_spawn_animation = false;
if (state_ == State::kNoSnap) {
// Add observers when the split view mode starts.
Shell::Get()->AddShellObserver(this);
Expand All @@ -901,20 +900,6 @@ void SplitViewController::AttachSnappingWindow(aura::Window* window,
// There is no divider bar in clamshell splitview mode.
if (split_view_type_ == SplitViewType::kTabletType) {
split_view_divider_ = std::make_unique<SplitViewDivider>(this);
// The divider spawn animation adds a finishing touch to the |window|
// animation that generally accommodates snapping by dragging, but if
// |window| is currently minimized then it will undergo the unminimizing
// animation instead. Therefore skip the divider spawn animation if
// |window| is minimized.
if (!WindowState::Get(window)->IsMinimized() &&
!window->transform().IsIdentity()) {
// For the divider spawn animation, at the end of the delay, the divider
// shall be visually aligned with an edge of |window|. This effect will
// be more easily achieved after |window| has been snapped and the
// corresponding transform animation has begun. So for now, just set a
// flag to indicate that the divider spawn animation should be done.
do_divider_spawn_animation = true;
}
}

splitview_start_time_ = base::Time::Now();
Expand Down

0 comments on commit 28aef8f

Please sign in to comment.