Refactor of ProfileInfoCache in c/b/notifications

ui/message_center/notifier_settings.h

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_MESSAGE_CENTER_NOTIFIER_SETTINGS_H_
 #define UI_MESSAGE_CENTER_NOTIFIER_SETTINGS_H_
 
 #include <stddef.h>
 
 #include <string>
+#include <vector>

[dewittj, 2016/02/08 18:07:10]

nit: I don't think this is used in this header file?

[lwchkg, 2016/02/08 19:06:43]

See line 180 (marked in comment.)

[dewittj, 2016/02/08 19:11:45]

right.  Thanks!

 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "ui/gfx/image/image.h"
 #include "ui/message_center/message_center_export.h"
 #include "url/gurl.h"
 
 class MessageCenterNotificationsTest;
 class MessageCenterTrayBridgeTest;
@@ skipping 86 matching lines @@
   // The icon image of the notifier. The extension icon or favicon.
   gfx::Image icon;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(Notifier);
 };
 
 struct MESSAGE_CENTER_EXPORT NotifierGroup {
   NotifierGroup(const gfx::Image& icon,
                 const base::string16& name,
-                const base::string16& login_info,
-                size_t index);
+                const base::string16& login_info);
   ~NotifierGroup();
 
   // Icon of a notifier group.
   const gfx::Image icon;
 
   // Display name of a notifier group.
   const base::string16 name;
 
   // More display information about the notifier group.
   base::string16 login_info;
 
-  // Unique identifier for the notifier group so that they can be selected in
-  // the UI.
-  const size_t index;
-
  private:
   DISALLOW_COPY_AND_ASSIGN(NotifierGroup);
 };
 
 // An observer class implemented by the view of the NotifierSettings to get
 // notified when the controller has changed data.
 class MESSAGE_CENTER_EXPORT NotifierSettingsObserver {
  public:
   // Called when an icon in the controller has been updated.
   virtual void UpdateIconImage(const NotifierId& notifier_id,
                                const gfx::Image& icon) = 0;
 
   // Called when any change happens to the set of notifier groups.
   virtual void NotifierGroupChanged() = 0;
 
   // Called when a notifier is enabled or disabled.
   virtual void NotifierEnabledChanged(const NotifierId& notifier_id,
                                       bool enabled) = 0;
 };
 
 // A class used by NotifierSettingsView to integrate with a setting system
 // for the clients of this module.
 class MESSAGE_CENTER_EXPORT NotifierSettingsProvider {
  public:
-  virtual ~NotifierSettingsProvider() {};
+  virtual ~NotifierSettingsProvider() {}
 
   // Sets the delegate.
   virtual void AddObserver(NotifierSettingsObserver* observer) = 0;
   virtual void RemoveObserver(NotifierSettingsObserver* observer) = 0;
 
   // Returns the number of notifier groups available.
   virtual size_t GetNotifierGroupCount() const = 0;
 
   // Requests the model for a particular notifier group.
   virtual const message_center::NotifierGroup& GetNotifierGroupAt(
       size_t index) const = 0;
 
   // Returns true if the notifier group at |index| is active.
   virtual bool IsNotifierGroupActiveAt(size_t index) const = 0;
 
   // Informs the settings provider that further requests to GetNotifierList
   // should return notifiers for the specified notifier group.
   virtual void SwitchToNotifierGroup(size_t index) = 0;
 
   // Requests the currently active notifier group.
   virtual const message_center::NotifierGroup& GetActiveNotifierGroup()
       const = 0;
 
   // Collects the current notifier list and fills to |notifiers|. Caller takes
   // the ownership of the elements of |notifiers|.
   virtual void GetNotifierList(std::vector<Notifier*>* notifiers) = 0;

[lwchkg, 2016/02/08 19:06:43]

<vector> corresponds to here.

 
   // Called when the |enabled| for the |notifier| has been changed by user
   // operation.
   virtual void SetNotifierEnabled(const Notifier& notifier, bool enabled) = 0;
 
   // Called when the settings window is closed.
   virtual void OnNotifierSettingsClosing() = 0;
 
   // Called to determine if a particular notifier can respond to a request for
   // more information.
   virtual bool NotifierHasAdvancedSettings(const NotifierId& notifier_id)
       const = 0;
 
   // Called upon request for more information about a particular notifier.
   virtual void OnNotifierAdvancedSettingsRequested(
       const NotifierId& notifier_id,
       const std::string* notification_id) = 0;
 };
 
 }  // namespace message_center
 
 #endif  // UI_MESSAGE_CENTER_NOTIFIER_SETTINGS_H_