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

Side by Side Diff: chrome/browser/notifications/message_center_settings_controller.h

Issue 624173002: replace OVERRIDE and FINAL with override and final in chrome/browser/[j-q]* (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 CHROME_BROWSER_NOTIFICATIONS_MESSAGE_CENTER_SETTINGS_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_NOTIFICATIONS_MESSAGE_CENTER_SETTINGS_CONTROLLER_H_
6 #define CHROME_BROWSER_NOTIFICATIONS_MESSAGE_CENTER_SETTINGS_CONTROLLER_H_ 6 #define CHROME_BROWSER_NOTIFICATIONS_MESSAGE_CENTER_SETTINGS_CONTROLLER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 public user_manager::UserManager::UserSessionStateObserver, 50 public user_manager::UserManager::UserSessionStateObserver,
51 #endif 51 #endif
52 public extensions::AppIconLoader::Delegate { 52 public extensions::AppIconLoader::Delegate {
53 public: 53 public:
54 explicit MessageCenterSettingsController( 54 explicit MessageCenterSettingsController(
55 ProfileInfoCache* profile_info_cache); 55 ProfileInfoCache* profile_info_cache);
56 virtual ~MessageCenterSettingsController(); 56 virtual ~MessageCenterSettingsController();
57 57
58 // Overridden from message_center::NotifierSettingsProvider. 58 // Overridden from message_center::NotifierSettingsProvider.
59 virtual void AddObserver( 59 virtual void AddObserver(
60 message_center::NotifierSettingsObserver* observer) OVERRIDE; 60 message_center::NotifierSettingsObserver* observer) override;
61 virtual void RemoveObserver( 61 virtual void RemoveObserver(
62 message_center::NotifierSettingsObserver* observer) OVERRIDE; 62 message_center::NotifierSettingsObserver* observer) override;
63 virtual size_t GetNotifierGroupCount() const OVERRIDE; 63 virtual size_t GetNotifierGroupCount() const override;
64 virtual const message_center::NotifierGroup& GetNotifierGroupAt( 64 virtual const message_center::NotifierGroup& GetNotifierGroupAt(
65 size_t index) const OVERRIDE; 65 size_t index) const override;
66 virtual bool IsNotifierGroupActiveAt(size_t index) const OVERRIDE; 66 virtual bool IsNotifierGroupActiveAt(size_t index) const override;
67 virtual void SwitchToNotifierGroup(size_t index) OVERRIDE; 67 virtual void SwitchToNotifierGroup(size_t index) override;
68 virtual const message_center::NotifierGroup& GetActiveNotifierGroup() const 68 virtual const message_center::NotifierGroup& GetActiveNotifierGroup() const
69 OVERRIDE; 69 override;
70 virtual void GetNotifierList( 70 virtual void GetNotifierList(
71 std::vector<message_center::Notifier*>* notifiers) OVERRIDE; 71 std::vector<message_center::Notifier*>* notifiers) override;
72 virtual void SetNotifierEnabled(const message_center::Notifier& notifier, 72 virtual void SetNotifierEnabled(const message_center::Notifier& notifier,
73 bool enabled) OVERRIDE; 73 bool enabled) override;
74 virtual void OnNotifierSettingsClosing() OVERRIDE; 74 virtual void OnNotifierSettingsClosing() override;
75 virtual bool NotifierHasAdvancedSettings( 75 virtual bool NotifierHasAdvancedSettings(
76 const message_center::NotifierId& notifier_id) const OVERRIDE; 76 const message_center::NotifierId& notifier_id) const override;
77 virtual void OnNotifierAdvancedSettingsRequested( 77 virtual void OnNotifierAdvancedSettingsRequested(
78 const message_center::NotifierId& notifier_id, 78 const message_center::NotifierId& notifier_id,
79 const std::string* notification_id) OVERRIDE; 79 const std::string* notification_id) override;
80 80
81 #if defined(OS_CHROMEOS) 81 #if defined(OS_CHROMEOS)
82 // Overridden from user_manager::UserManager::UserSessionStateObserver. 82 // Overridden from user_manager::UserManager::UserSessionStateObserver.
83 virtual void ActiveUserChanged( 83 virtual void ActiveUserChanged(
84 const user_manager::User* active_user) OVERRIDE; 84 const user_manager::User* active_user) override;
85 #endif 85 #endif
86 86
87 // Overridden from extensions::AppIconLoader::Delegate. 87 // Overridden from extensions::AppIconLoader::Delegate.
88 virtual void SetAppImage(const std::string& id, 88 virtual void SetAppImage(const std::string& id,
89 const gfx::ImageSkia& image) OVERRIDE; 89 const gfx::ImageSkia& image) override;
90 90
91 private: 91 private:
92 // Overridden from content::NotificationObserver. 92 // Overridden from content::NotificationObserver.
93 virtual void Observe(int type, 93 virtual void Observe(int type,
94 const content::NotificationSource& source, 94 const content::NotificationSource& source,
95 const content::NotificationDetails& details) OVERRIDE; 95 const content::NotificationDetails& details) override;
96 96
97 void OnFaviconLoaded(const GURL& url, 97 void OnFaviconLoaded(const GURL& url,
98 const favicon_base::FaviconImageResult& favicon_result); 98 const favicon_base::FaviconImageResult& favicon_result);
99 99
100 #if defined(OS_CHROMEOS) 100 #if defined(OS_CHROMEOS)
101 // Sets up the notifier group for the guest session. This needs to be 101 // Sets up the notifier group for the guest session. This needs to be
102 // separated from RebuildNotifierGroup() and called asynchronously to avoid 102 // separated from RebuildNotifierGroup() and called asynchronously to avoid
103 // the infinite loop of creating profile. See more the comment of 103 // the infinite loop of creating profile. See more the comment of
104 // RebuildNotifierGroups(). 104 // RebuildNotifierGroups().
105 void CreateNotifierGroupForGuestLogin(); 105 void CreateNotifierGroupForGuestLogin();
(...skipping 19 matching lines...) Expand all
125 content::NotificationRegistrar registrar_; 125 content::NotificationRegistrar registrar_;
126 126
127 ProfileInfoCache* profile_info_cache_; 127 ProfileInfoCache* profile_info_cache_;
128 128
129 base::WeakPtrFactory<MessageCenterSettingsController> weak_factory_; 129 base::WeakPtrFactory<MessageCenterSettingsController> weak_factory_;
130 130
131 DISALLOW_COPY_AND_ASSIGN(MessageCenterSettingsController); 131 DISALLOW_COPY_AND_ASSIGN(MessageCenterSettingsController);
132 }; 132 };
133 133
134 #endif // CHROME_BROWSER_NOTIFICATIONS_MESSAGE_CENTER_SETTINGS_CONTROLLER_H_ 134 #endif // CHROME_BROWSER_NOTIFICATIONS_MESSAGE_CENTER_SETTINGS_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698