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

Side by Side Diff: ash/frame/caption_buttons/frame_size_button.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 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 #ifndef ASH_FRAME_CAPTION_BUTTONS_FRAME_SIZE_BUTTON_H_ 5 #ifndef ASH_FRAME_CAPTION_BUTTONS_FRAME_SIZE_BUTTON_H_
6 #define ASH_FRAME_CAPTION_BUTTONS_FRAME_SIZE_BUTTON_H_ 6 #define ASH_FRAME_CAPTION_BUTTONS_FRAME_SIZE_BUTTON_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/frame/caption_buttons/frame_caption_button.h" 9 #include "ash/frame/caption_buttons/frame_caption_button.h"
10 #include "ash/frame/caption_buttons/frame_size_button_delegate.h" 10 #include "ash/frame/caption_buttons/frame_size_button_delegate.h"
(...skipping 18 matching lines...) Expand all
29 // handler for a click starting on the size button and the entire drag. 29 // handler for a click starting on the size button and the entire drag.
30 class ASH_EXPORT FrameSizeButton : public FrameCaptionButton { 30 class ASH_EXPORT FrameSizeButton : public FrameCaptionButton {
31 public: 31 public:
32 FrameSizeButton(views::ButtonListener* listener, 32 FrameSizeButton(views::ButtonListener* listener,
33 views::Widget* frame, 33 views::Widget* frame,
34 FrameSizeButtonDelegate* delegate); 34 FrameSizeButtonDelegate* delegate);
35 35
36 virtual ~FrameSizeButton(); 36 virtual ~FrameSizeButton();
37 37
38 // views::CustomButton overrides: 38 // views::CustomButton overrides:
39 virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; 39 virtual bool OnMousePressed(const ui::MouseEvent& event) override;
40 virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE; 40 virtual bool OnMouseDragged(const ui::MouseEvent& event) override;
41 virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE; 41 virtual void OnMouseReleased(const ui::MouseEvent& event) override;
42 virtual void OnMouseCaptureLost() OVERRIDE; 42 virtual void OnMouseCaptureLost() override;
43 virtual void OnMouseMoved(const ui::MouseEvent& event) OVERRIDE; 43 virtual void OnMouseMoved(const ui::MouseEvent& event) override;
44 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; 44 virtual void OnGestureEvent(ui::GestureEvent* event) override;
45 45
46 void set_delay_to_set_buttons_to_snap_mode(int delay_ms) { 46 void set_delay_to_set_buttons_to_snap_mode(int delay_ms) {
47 set_buttons_to_snap_mode_delay_ms_ = delay_ms; 47 set_buttons_to_snap_mode_delay_ms_ = delay_ms;
48 } 48 }
49 49
50 private: 50 private:
51 enum SnapType { 51 enum SnapType {
52 SNAP_LEFT, 52 SNAP_LEFT,
53 SNAP_RIGHT, 53 SNAP_RIGHT,
54 SNAP_NONE 54 SNAP_NONE
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 // snapping the window left or right. The preview is only visible if the snap 112 // snapping the window left or right. The preview is only visible if the snap
113 // left or snap right button is pressed. 113 // left or snap right button is pressed.
114 scoped_ptr<PhantomWindowController> phantom_window_controller_; 114 scoped_ptr<PhantomWindowController> phantom_window_controller_;
115 115
116 DISALLOW_COPY_AND_ASSIGN(FrameSizeButton); 116 DISALLOW_COPY_AND_ASSIGN(FrameSizeButton);
117 }; 117 };
118 118
119 } // namespace ash 119 } // namespace ash
120 120
121 #endif // ASH_FRAME_CAPTION_BUTTONS_FRAME_SIZE_BUTTON_H_ 121 #endif // ASH_FRAME_CAPTION_BUTTONS_FRAME_SIZE_BUTTON_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698