Remove CONTENT_SETTINGS_NUM_TYPES (part 2)

chrome/browser/ui/content_settings/content_setting_bubble_model.h

 // Copyright (c) 2012 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 CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_BUBBLE_MODEL_H_
 #define CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_BUBBLE_MODEL_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 79 matching lines @@
     std::string custom_link;
     bool custom_link_enabled;
     std::string manage_link;
     MediaMenuMap media_menus;
     std::string learn_more_link;
 
    private:
     DISALLOW_COPY_AND_ASSIGN(BubbleContent);
   };
 
+  // Returns a vector of the Supported bubble types.
+  static const std::set<ContentSettingsType>& GetSupportedBubbleTypes();
+
+  // Returns true if the given ContentSettingsType has a bubble.
+  static bool HasBubble(ContentSettingsType type);

[tapted, 2015/09/03 06:36:38]

HasBubbleForType?

(HasBubble sounds too much like IsBubbleShowing)

[raymes, 2015/09/07 04:29:27]

I removed this and changed the callers to just check the set returned above :)

+
   static ContentSettingBubbleModel* CreateContentSettingBubbleModel(
       Delegate* delegate,
       content::WebContents* web_contents,
       Profile* profile,
       ContentSettingsType content_type);
 
   ~ContentSettingBubbleModel() override;
 
   ContentSettingsType content_type() const { return content_type_; }
 
@@ skipping 114 matching lines @@
   void IgnoreProtocolHandler();
   void ClearOrSetPreviousHandler();
 
   int selected_item_;
   ProtocolHandlerRegistry* registry_;
   ProtocolHandler pending_handler_;
   ProtocolHandler previous_handler_;
 };
 
 #endif  // CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_BUBBLE_MODEL_H_