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

Side by Side Diff: ash/wm/workspace/workspace_window_resizer.h

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef ASH_WM_WORKSPACE_WINDOW_RESIZER_H_ 5 #ifndef ASH_WM_WORKSPACE_WINDOW_RESIZER_H_
6 #define ASH_WM_WORKSPACE_WINDOW_RESIZER_H_ 6 #define ASH_WM_WORKSPACE_WINDOW_RESIZER_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/wm/window_resizer.h" 10 #include "ash/wm/window_resizer.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 static const int kStickyDistancePixels; 50 static const int kStickyDistancePixels;
51 51
52 virtual ~WorkspaceWindowResizer(); 52 virtual ~WorkspaceWindowResizer();
53 53
54 static WorkspaceWindowResizer* Create( 54 static WorkspaceWindowResizer* Create(
55 wm::WindowState* window_state, 55 wm::WindowState* window_state,
56 const std::vector<aura::Window*>& attached_windows); 56 const std::vector<aura::Window*>& attached_windows);
57 57
58 // WindowResizer: 58 // WindowResizer:
59 virtual void Drag(const gfx::Point& location_in_parent, 59 virtual void Drag(const gfx::Point& location_in_parent,
60 int event_flags) OVERRIDE; 60 int event_flags) override;
61 virtual void CompleteDrag() OVERRIDE; 61 virtual void CompleteDrag() override;
62 virtual void RevertDrag() OVERRIDE; 62 virtual void RevertDrag() override;
63 63
64 private: 64 private:
65 WorkspaceWindowResizer(wm::WindowState* window_state, 65 WorkspaceWindowResizer(wm::WindowState* window_state,
66 const std::vector<aura::Window*>& attached_windows); 66 const std::vector<aura::Window*>& attached_windows);
67 67
68 private: 68 private:
69 friend class WorkspaceWindowResizerTest; 69 friend class WorkspaceWindowResizerTest;
70 70
71 // The edge to which the window should be snapped at the end of the drag. 71 // The edge to which the window should be snapped at the end of the drag.
72 enum SnapType { 72 enum SnapType {
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 // Used to determine if this has been deleted during a drag such as when a tab 223 // Used to determine if this has been deleted during a drag such as when a tab
224 // gets dragged into another browser window. 224 // gets dragged into another browser window.
225 base::WeakPtrFactory<WorkspaceWindowResizer> weak_ptr_factory_; 225 base::WeakPtrFactory<WorkspaceWindowResizer> weak_ptr_factory_;
226 226
227 DISALLOW_COPY_AND_ASSIGN(WorkspaceWindowResizer); 227 DISALLOW_COPY_AND_ASSIGN(WorkspaceWindowResizer);
228 }; 228 };
229 229
230 } // namespace ash 230 } // namespace ash
231 231
232 #endif // ASH_WM_WORKSPACE_WINDOW_RESIZER_H_ 232 #endif // ASH_WM_WORKSPACE_WINDOW_RESIZER_H_
OLDNEW
« no previous file with comments | « ash/wm/workspace/workspace_layout_manager_unittest.cc ('k') | ash/wm/workspace/workspace_window_resizer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698