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

Side by Side Diff: ash/frame/caption_buttons/frame_size_button.cc

Issue 1890713002: Adds WmWindow and converts WindowState to use it (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge again Created 4 years, 8 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 unified diff | Download patch
« no previous file with comments | « ash/focus_cycler.cc ('k') | ash/frame/caption_buttons/frame_size_button_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/frame/caption_buttons/frame_size_button.h" 5 #include "ash/frame/caption_buttons/frame_size_button.h"
6 6
7 #include "ash/metrics/user_metrics_recorder.h" 7 #include "ash/metrics/user_metrics_recorder.h"
8 #include "ash/screen_util.h" 8 #include "ash/screen_util.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/wm/common/wm_event.h" 10 #include "ash/wm/common/wm_event.h"
11 #include "ash/wm/window_state.h" 11 #include "ash/wm/window_state.h"
12 #include "ash/wm/window_state_aura.h"
12 #include "ash/wm/window_util.h" 13 #include "ash/wm/window_util.h"
13 #include "ash/wm/workspace/phantom_window_controller.h" 14 #include "ash/wm/workspace/phantom_window_controller.h"
14 #include "base/i18n/rtl.h" 15 #include "base/i18n/rtl.h"
15 #include "ui/gfx/geometry/vector2d.h" 16 #include "ui/gfx/geometry/vector2d.h"
16 #include "ui/views/widget/widget.h" 17 #include "ui/views/widget/widget.h"
17 18
18 namespace { 19 namespace {
19 20
20 // The default delay between the user pressing the size button and the buttons 21 // The default delay between the user pressing the size button and the buttons
21 // adjacent to the size button morphing into buttons for snapping left and 22 // adjacent to the size button morphing into buttons for snapping left and
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 void FrameSizeButton::SetButtonsToNormalMode( 273 void FrameSizeButton::SetButtonsToNormalMode(
273 FrameSizeButtonDelegate::Animate animate) { 274 FrameSizeButtonDelegate::Animate animate) {
274 in_snap_mode_ = false; 275 in_snap_mode_ = false;
275 snap_type_ = SNAP_NONE; 276 snap_type_ = SNAP_NONE;
276 set_buttons_to_snap_mode_timer_.Stop(); 277 set_buttons_to_snap_mode_timer_.Stop();
277 delegate_->SetButtonsToNormal(animate); 278 delegate_->SetButtonsToNormal(animate);
278 phantom_window_controller_.reset(); 279 phantom_window_controller_.reset();
279 } 280 }
280 281
281 } // namespace ash 282 } // namespace ash
OLDNEW
« no previous file with comments | « ash/focus_cycler.cc ('k') | ash/frame/caption_buttons/frame_size_button_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698