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

Side by Side Diff: ash/display/resolution_notification_controller.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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/display/resolution_notification_controller.h" 5 #include "ash/display/resolution_notification_controller.h"
6 6
7 #include "ash/display/display_controller.h" 7 #include "ash/display/display_controller.h"
8 #include "ash/display/display_info.h" 8 #include "ash/display/display_info.h"
9 #include "ash/display/display_manager.h" 9 #include "ash/display/display_manager.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 22 matching lines...) Expand all
33 public: 33 public:
34 ResolutionChangeNotificationDelegate( 34 ResolutionChangeNotificationDelegate(
35 ResolutionNotificationController* controller, 35 ResolutionNotificationController* controller,
36 bool has_timeout); 36 bool has_timeout);
37 37
38 protected: 38 protected:
39 virtual ~ResolutionChangeNotificationDelegate(); 39 virtual ~ResolutionChangeNotificationDelegate();
40 40
41 private: 41 private:
42 // message_center::NotificationDelegate overrides: 42 // message_center::NotificationDelegate overrides:
43 virtual void Display() OVERRIDE; 43 virtual void Display() override;
44 virtual void Error() OVERRIDE; 44 virtual void Error() override;
45 virtual void Close(bool by_user) OVERRIDE; 45 virtual void Close(bool by_user) override;
46 virtual void Click() OVERRIDE; 46 virtual void Click() override;
47 virtual bool HasClickedListener() OVERRIDE; 47 virtual bool HasClickedListener() override;
48 virtual void ButtonClick(int button_index) OVERRIDE; 48 virtual void ButtonClick(int button_index) override;
49 49
50 ResolutionNotificationController* controller_; 50 ResolutionNotificationController* controller_;
51 bool has_timeout_; 51 bool has_timeout_;
52 52
53 DISALLOW_COPY_AND_ASSIGN(ResolutionChangeNotificationDelegate); 53 DISALLOW_COPY_AND_ASSIGN(ResolutionChangeNotificationDelegate);
54 }; 54 };
55 55
56 ResolutionChangeNotificationDelegate::ResolutionChangeNotificationDelegate( 56 ResolutionChangeNotificationDelegate::ResolutionChangeNotificationDelegate(
57 ResolutionNotificationController* controller, 57 ResolutionNotificationController* controller,
58 bool has_timeout) 58 bool has_timeout)
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 this, 309 this,
310 &ResolutionNotificationController::OnTimerTick); 310 &ResolutionNotificationController::OnTimerTick);
311 } 311 }
312 } 312 }
313 313
314 void ResolutionNotificationController::SuppressTimerForTest() { 314 void ResolutionNotificationController::SuppressTimerForTest() {
315 g_use_timer = false; 315 g_use_timer = false;
316 } 316 }
317 317
318 } // namespace ash 318 } // namespace ash
OLDNEW
« no previous file with comments | « ash/display/resolution_notification_controller.h ('k') | ash/display/resolution_notification_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698