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

Side by Side Diff: ash/shelf/shelf_layout_manager.cc

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
« no previous file with comments | « ash/shelf/shelf_layout_manager.h ('k') | ash/shelf/shelf_layout_manager_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 (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 #include "ash/shelf/shelf_layout_manager.h" 5 #include "ash/shelf/shelf_layout_manager.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <cstring> 9 #include <cstring>
10 #include <string> 10 #include <string>
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 // Notifies ShelfLayoutManager any time the mouse moves. 102 // Notifies ShelfLayoutManager any time the mouse moves.
103 class ShelfLayoutManager::AutoHideEventFilter : public ui::EventHandler { 103 class ShelfLayoutManager::AutoHideEventFilter : public ui::EventHandler {
104 public: 104 public:
105 explicit AutoHideEventFilter(ShelfLayoutManager* shelf); 105 explicit AutoHideEventFilter(ShelfLayoutManager* shelf);
106 virtual ~AutoHideEventFilter(); 106 virtual ~AutoHideEventFilter();
107 107
108 // Returns true if the last mouse event was a mouse drag. 108 // Returns true if the last mouse event was a mouse drag.
109 bool in_mouse_drag() const { return in_mouse_drag_; } 109 bool in_mouse_drag() const { return in_mouse_drag_; }
110 110
111 // Overridden from ui::EventHandler: 111 // Overridden from ui::EventHandler:
112 virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; 112 virtual void OnMouseEvent(ui::MouseEvent* event) override;
113 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; 113 virtual void OnGestureEvent(ui::GestureEvent* event) override;
114 114
115 private: 115 private:
116 ShelfLayoutManager* shelf_; 116 ShelfLayoutManager* shelf_;
117 bool in_mouse_drag_; 117 bool in_mouse_drag_;
118 ShelfGestureHandler gesture_handler_; 118 ShelfGestureHandler gesture_handler_;
119 DISALLOW_COPY_AND_ASSIGN(AutoHideEventFilter); 119 DISALLOW_COPY_AND_ASSIGN(AutoHideEventFilter);
120 }; 120 };
121 121
122 ShelfLayoutManager::AutoHideEventFilter::AutoHideEventFilter( 122 ShelfLayoutManager::AutoHideEventFilter::AutoHideEventFilter(
123 ShelfLayoutManager* shelf) 123 ShelfLayoutManager* shelf)
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 : public ui::ImplicitAnimationObserver { 159 : public ui::ImplicitAnimationObserver {
160 public: 160 public:
161 explicit UpdateShelfObserver(ShelfLayoutManager* shelf) : shelf_(shelf) { 161 explicit UpdateShelfObserver(ShelfLayoutManager* shelf) : shelf_(shelf) {
162 shelf_->update_shelf_observer_ = this; 162 shelf_->update_shelf_observer_ = this;
163 } 163 }
164 164
165 void Detach() { 165 void Detach() {
166 shelf_ = NULL; 166 shelf_ = NULL;
167 } 167 }
168 168
169 virtual void OnImplicitAnimationsCompleted() OVERRIDE { 169 virtual void OnImplicitAnimationsCompleted() override {
170 if (shelf_) 170 if (shelf_)
171 shelf_->UpdateShelfBackground(BACKGROUND_CHANGE_ANIMATE); 171 shelf_->UpdateShelfBackground(BACKGROUND_CHANGE_ANIMATE);
172 delete this; 172 delete this;
173 } 173 }
174 174
175 private: 175 private:
176 virtual ~UpdateShelfObserver() { 176 virtual ~UpdateShelfObserver() {
177 if (shelf_) 177 if (shelf_)
178 shelf_->update_shelf_observer_ = NULL; 178 shelf_->update_shelf_observer_ = NULL;
179 } 179 }
(...skipping 967 matching lines...) Expand 10 before | Expand all | Expand 10 after
1147 1147
1148 void ShelfLayoutManager::SessionStateChanged( 1148 void ShelfLayoutManager::SessionStateChanged(
1149 SessionStateDelegate::SessionState state) { 1149 SessionStateDelegate::SessionState state) {
1150 TargetBounds target_bounds; 1150 TargetBounds target_bounds;
1151 CalculateTargetBounds(state_, &target_bounds); 1151 CalculateTargetBounds(state_, &target_bounds);
1152 UpdateBoundsAndOpacity(target_bounds, true, NULL); 1152 UpdateBoundsAndOpacity(target_bounds, true, NULL);
1153 UpdateVisibilityState(); 1153 UpdateVisibilityState();
1154 } 1154 }
1155 1155
1156 } // namespace ash 1156 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shelf/shelf_layout_manager.h ('k') | ash/shelf/shelf_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698