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

Side by Side Diff: athena/wm/split_view_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/wm/overview_toolbar.cc ('k') | athena/wm/split_view_controller.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_SPLIT_VIEW_CONTROLLER_H_ 5 #ifndef ATHENA_WM_SPLIT_VIEW_CONTROLLER_H_
6 #define ATHENA_WM_SPLIT_VIEW_CONTROLLER_H_ 6 #define ATHENA_WM_SPLIT_VIEW_CONTROLLER_H_
7 7
8 #include "athena/athena_export.h" 8 #include "athena/athena_export.h"
9 #include "athena/util/drag_handle.h" 9 #include "athena/util/drag_handle.h"
10 #include "athena/wm/bezel_controller.h" 10 #include "athena/wm/bezel_controller.h"
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 102
103 // Called when the animation initiated by SetWindowTransforms() completes. 103 // Called when the animation initiated by SetWindowTransforms() completes.
104 void OnAnimationCompleted(); 104 void OnAnimationCompleted();
105 105
106 // Returns the default divider position for when the split view mode is 106 // Returns the default divider position for when the split view mode is
107 // active and the divider is not being dragged. 107 // active and the divider is not being dragged.
108 int GetDefaultDividerPosition(); 108 int GetDefaultDividerPosition();
109 109
110 // BezelController::ScrollDelegate: 110 // BezelController::ScrollDelegate:
111 virtual void BezelScrollBegin(BezelController::Bezel bezel, 111 virtual void BezelScrollBegin(BezelController::Bezel bezel,
112 float delta) OVERRIDE; 112 float delta) override;
113 virtual void BezelScrollEnd() OVERRIDE; 113 virtual void BezelScrollEnd() override;
114 virtual void BezelScrollUpdate(float delta) OVERRIDE; 114 virtual void BezelScrollUpdate(float delta) override;
115 virtual bool BezelCanScroll() OVERRIDE; 115 virtual bool BezelCanScroll() override;
116 116
117 // DragHandleScrollDelegate: 117 // DragHandleScrollDelegate:
118 virtual void HandleScrollBegin(float delta) OVERRIDE; 118 virtual void HandleScrollBegin(float delta) override;
119 virtual void HandleScrollEnd() OVERRIDE; 119 virtual void HandleScrollEnd() override;
120 virtual void HandleScrollUpdate(float delta) OVERRIDE; 120 virtual void HandleScrollUpdate(float delta) override;
121 121
122 // WindowManagerObserver: 122 // WindowManagerObserver:
123 virtual void OnOverviewModeEnter() OVERRIDE; 123 virtual void OnOverviewModeEnter() override;
124 virtual void OnOverviewModeExit() OVERRIDE; 124 virtual void OnOverviewModeExit() override;
125 virtual void OnSplitViewModeEnter() OVERRIDE; 125 virtual void OnSplitViewModeEnter() override;
126 virtual void OnSplitViewModeExit() OVERRIDE; 126 virtual void OnSplitViewModeExit() override;
127 127
128 State state_; 128 State state_;
129 129
130 aura::Window* container_; 130 aura::Window* container_;
131 131
132 // Provider of the list of windows to cycle through. Not owned. 132 // Provider of the list of windows to cycle through. Not owned.
133 WindowListProvider* window_list_provider_; 133 WindowListProvider* window_list_provider_;
134 134
135 // Windows for the left and right activities shown in SCROLLING and ACTIVE 135 // Windows for the left and right activities shown in SCROLLING and ACTIVE
136 // states. In INACTIVE state these are NULL. 136 // states. In INACTIVE state these are NULL.
(...skipping 23 matching lines...) Expand all
160 std::vector<aura::Window*> to_hide_; 160 std::vector<aura::Window*> to_hide_;
161 161
162 base::WeakPtrFactory<SplitViewController> weak_factory_; 162 base::WeakPtrFactory<SplitViewController> weak_factory_;
163 163
164 DISALLOW_COPY_AND_ASSIGN(SplitViewController); 164 DISALLOW_COPY_AND_ASSIGN(SplitViewController);
165 }; 165 };
166 166
167 } // namespace athena 167 } // namespace athena
168 168
169 #endif // ATHENA_WM_SPLIT_VIEW_CONTROLLER_H_ 169 #endif // ATHENA_WM_SPLIT_VIEW_CONTROLLER_H_
OLDNEW
« no previous file with comments | « athena/wm/overview_toolbar.cc ('k') | athena/wm/split_view_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698