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

Side by Side Diff: ui/message_center/cocoa/settings_controller.h

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 #ifndef UI_MESSAGE_CENTER_COCOA_SETTINGS_CONTROLLER_H_ 5 #ifndef UI_MESSAGE_CENTER_COCOA_SETTINGS_CONTROLLER_H_
6 #define UI_MESSAGE_CENTER_COCOA_SETTINGS_CONTROLLER_H_ 6 #define UI_MESSAGE_CENTER_COCOA_SETTINGS_CONTROLLER_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #import "base/mac/scoped_nsobject.h" 10 #import "base/mac/scoped_nsobject.h"
(...skipping 10 matching lines...) Expand all
21 21
22 // Bridge class between C++ and Cocoa world. 22 // Bridge class between C++ and Cocoa world.
23 class NotifierSettingsObserverMac : public NotifierSettingsObserver { 23 class NotifierSettingsObserverMac : public NotifierSettingsObserver {
24 public: 24 public:
25 NotifierSettingsObserverMac(MCSettingsController* settings_controller) 25 NotifierSettingsObserverMac(MCSettingsController* settings_controller)
26 : settings_controller_(settings_controller) {} 26 : settings_controller_(settings_controller) {}
27 virtual ~NotifierSettingsObserverMac(); 27 virtual ~NotifierSettingsObserverMac();
28 28
29 // Overridden from NotifierSettingsObserver: 29 // Overridden from NotifierSettingsObserver:
30 virtual void UpdateIconImage(const NotifierId& notifier_id, 30 virtual void UpdateIconImage(const NotifierId& notifier_id,
31 const gfx::Image& icon) OVERRIDE; 31 const gfx::Image& icon) override;
32 virtual void NotifierGroupChanged() OVERRIDE; 32 virtual void NotifierGroupChanged() override;
33 virtual void NotifierEnabledChanged(const NotifierId& notifier_id, 33 virtual void NotifierEnabledChanged(const NotifierId& notifier_id,
34 bool enabled) OVERRIDE; 34 bool enabled) override;
35 35
36 private: 36 private:
37 MCSettingsController* settings_controller_; // weak, owns this 37 MCSettingsController* settings_controller_; // weak, owns this
38 38
39 DISALLOW_COPY_AND_ASSIGN(NotifierSettingsObserverMac); 39 DISALLOW_COPY_AND_ASSIGN(NotifierSettingsObserverMac);
40 }; 40 };
41 41
42 } // namespace message_center 42 } // namespace message_center
43 43
44 // The view controller responsible for the settings sheet in the center. 44 // The view controller responsible for the settings sheet in the center.
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 @end 82 @end
83 83
84 // Testing API ///////////////////////////////////////////////////////////////// 84 // Testing API /////////////////////////////////////////////////////////////////
85 85
86 @interface MCSettingsController (TestingAPI) 86 @interface MCSettingsController (TestingAPI)
87 - (NSPopUpButton*)groupDropDownButton; 87 - (NSPopUpButton*)groupDropDownButton;
88 - (NSScrollView*)scrollView; 88 - (NSScrollView*)scrollView;
89 @end 89 @end
90 90
91 #endif // UI_MESSAGE_CENTER_COCOA_SETTINGS_CONTROLLER_H_ 91 #endif // UI_MESSAGE_CENTER_COCOA_SETTINGS_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ui/message_center/cocoa/popup_collection_unittest.mm ('k') | ui/message_center/cocoa/status_item_view_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698