Revert of [Extensions] Make extension message bubble factory platform-abstract

chrome/browser/extensions/settings_api_bubble_controller.cc

 // Copyright (c) 2014 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.
 
 #include "chrome/browser/extensions/settings_api_bubble_controller.h"
 
 #include "base/metrics/histogram.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_toolbar_model.h"
 #include "chrome/browser/extensions/settings_api_helpers.h"
@@ skipping 36 matching lines @@
   void PerformAction(const ExtensionIdList& list) override;
   void OnClose() override;
   base::string16 GetTitle() const override;
   base::string16 GetMessageBody(bool anchored_to_browser_action) const override;
   base::string16 GetOverflowText(
       const base::string16& overflow_count) const override;
   GURL GetLearnMoreUrl() const override;
   base::string16 GetActionButtonLabel() const override;
   base::string16 GetDismissButtonLabel() const override;
   bool ShouldShowExtensionList() const override;
-  bool ShouldHighlightExtensions() const override;
   void LogExtensionCount(size_t count) override;
   void LogAction(
       ExtensionMessageBubbleController::BubbleAction action) override;
 
  private:
   // Our extension service. Weak, not owned by us.
   ExtensionService* service_;
 
   // A weak pointer to the profile we are associated with. Not owned by us.
   Profile* profile_;
@@ skipping 170 matching lines @@
 }
 
 base::string16 SettingsApiBubbleDelegate::GetDismissButtonLabel() const {
   return l10n_util::GetStringUTF16(IDS_EXTENSION_CONTROLLED_KEEP_CHANGES);
 }
 
 bool SettingsApiBubbleDelegate::ShouldShowExtensionList() const {
   return false;
 }
 
-bool SettingsApiBubbleDelegate::ShouldHighlightExtensions() const {
-  return type_ == BUBBLE_TYPE_STARTUP_PAGES;
-}
-
 void SettingsApiBubbleDelegate::LogExtensionCount(size_t count) {
 }
 
 void SettingsApiBubbleDelegate::LogAction(
     ExtensionMessageBubbleController::BubbleAction action) {
   switch (type_) {
     case BUBBLE_TYPE_HOME_PAGE:
       UMA_HISTOGRAM_ENUMERATION(
           "ExtensionOverrideBubble.SettingsApiUserSelectionHomePage",
           action,
@@ skipping 26 matching lines @@
           new SettingsApiBubbleDelegate(
               ExtensionSystem::Get(profile)->extension_service(),
               profile,
               type),
           profile),
       profile_(profile),
       type_(type) {}
 
 SettingsApiBubbleController::~SettingsApiBubbleController() {}
 
-bool SettingsApiBubbleController::ShouldShow() {
-  const Extension* extension = nullptr;
-  switch (type_) {
-    case BUBBLE_TYPE_HOME_PAGE:
-      extension = GetExtensionOverridingHomepage(profile_);
-      break;
-    case BUBBLE_TYPE_SEARCH_ENGINE:
-      extension = GetExtensionOverridingSearchEngine(profile_);
-      break;
-    case BUBBLE_TYPE_STARTUP_PAGES:
-      extension = GetExtensionOverridingStartupPages(profile_);
-      break;
-  }
-
-  if (!extension)
+bool SettingsApiBubbleController::ShouldShow(const std::string& extension_id) {
+  if (delegate()->HasBubbleInfoBeenAcknowledged(extension_id))
     return false;
 
-  if (delegate()->HasBubbleInfoBeenAcknowledged(extension->id()))
-    return false;
-
-  if (!delegate()->ShouldIncludeExtension(extension->id()))
+  if (!delegate()->ShouldIncludeExtension(extension_id))
     return false;
 
   // If the browser is showing the 'Chrome crashed' infobar, it won't be showing
   // the startup pages, so there's no point in showing the bubble now.
   if (type_ == BUBBLE_TYPE_STARTUP_PAGES)
     return profile_->GetLastSessionExitType() != Profile::EXIT_CRASHED;
 
   return true;
 }
 
 bool SettingsApiBubbleController::CloseOnDeactivate() {
   // Startup bubbles tend to get lost in the focus storm that happens on
   // startup. Other types should dismiss on focus loss.
   return type_ != BUBBLE_TYPE_STARTUP_PAGES;
 }
 
 }  // namespace extensions