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

Side by Side Diff: athena/wm/bezel_controller.h

Issue 623103002: replace OVERRIDE and FINAL with override and final in athena/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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
« no previous file with comments | « athena/virtual_keyboard/virtual_keyboard_manager_impl.cc ('k') | athena/wm/overview_toolbar.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 #ifndef ATHENA_WM_BEZEL_CONTROLLER_H_ 5 #ifndef ATHENA_WM_BEZEL_CONTROLLER_H_
6 #define ATHENA_WM_BEZEL_CONTROLLER_H_ 6 #define ATHENA_WM_BEZEL_CONTROLLER_H_
7 7
8 #include "ui/events/event_handler.h" 8 #include "ui/events/event_handler.h"
9 9
10 namespace aura { 10 namespace aura {
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 BEZEL_SCROLLING_ONE_FINGER, 69 BEZEL_SCROLLING_ONE_FINGER,
70 BEZEL_SCROLLING_TWO_FINGERS, 70 BEZEL_SCROLLING_TWO_FINGERS,
71 }; 71 };
72 72
73 void SetState(State state); 73 void SetState(State state);
74 // |scroll_delta| only needs to be passed when |state| is one of the 74 // |scroll_delta| only needs to be passed when |state| is one of the
75 // BEZEL_SROLLING states. 75 // BEZEL_SROLLING states.
76 void SetState(State state, float scroll_delta); 76 void SetState(State state, float scroll_delta);
77 77
78 // ui::EventHandler overrides 78 // ui::EventHandler overrides
79 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; 79 virtual void OnGestureEvent(ui::GestureEvent* event) override;
80 80
81 aura::Window* container_; 81 aura::Window* container_;
82 82
83 State state_; 83 State state_;
84 84
85 // The bezel where the currently active scroll was started. 85 // The bezel where the currently active scroll was started.
86 Bezel scroll_bezel_; 86 Bezel scroll_bezel_;
87 87
88 // The target of the bezel scroll gesture. Used to filter out other gestures 88 // The target of the bezel scroll gesture. Used to filter out other gestures
89 // when the bezel scroll is in progress. 89 // when the bezel scroll is in progress.
90 ui::EventTarget* scroll_target_; 90 ui::EventTarget* scroll_target_;
91 91
92 // Responsible for handling gestures started from the left and right bezels. 92 // Responsible for handling gestures started from the left and right bezels.
93 // Not owned. 93 // Not owned.
94 ScrollDelegate* left_right_delegate_; 94 ScrollDelegate* left_right_delegate_;
95 95
96 DISALLOW_COPY_AND_ASSIGN(BezelController); 96 DISALLOW_COPY_AND_ASSIGN(BezelController);
97 }; 97 };
98 98
99 } // namespace athena 99 } // namespace athena
100 100
101 #endif // ATHENA_WM_BEZEL_CONTROLLER_H_ 101 #endif // ATHENA_WM_BEZEL_CONTROLLER_H_
OLDNEW
« no previous file with comments | « athena/virtual_keyboard/virtual_keyboard_manager_impl.cc ('k') | athena/wm/overview_toolbar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698