Refactor the extension message bubbles.

chrome/browser/extensions/extension_message_bubble_controller.cc

 // 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.
 
 #include "chrome/browser/extensions/extension_message_bubble_controller.h"
 
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_message_bubble.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/user_metrics.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace extensions {
 
 ////////////////////////////////////////////////////////////////////////////////
+// ExtensionMessageBubbleController::Delegate
+
+ExtensionMessageBubbleController::Delegate::Delegate() {
+}
+
+ExtensionMessageBubbleController::Delegate::~Delegate() {
+}
+
+////////////////////////////////////////////////////////////////////////////////
 // ExtensionMessageBubbleController
 
 ExtensionMessageBubbleController::ExtensionMessageBubbleController(
     Delegate* delegate, Profile* profile)
     : service_(extensions::ExtensionSystem::Get(profile)->extension_service()),
       profile_(profile),
       user_action_(ACTION_BOUNDARY),
       delegate_(delegate),
-      initialized_(false),
-      has_notified_(false) {
+      initialized_(false) {
 }
 
 ExtensionMessageBubbleController::~ExtensionMessageBubbleController() {
 }
 
-bool ExtensionMessageBubbleController::ShouldShow() {
-  if (has_notified_)
-    return false;
-
-  has_notified_ = true;
-  return !GetOrCreateExtensionList()->empty();
-}
-
 std::vector<base::string16>
 ExtensionMessageBubbleController::GetExtensionList() {
   ExtensionIdList* list = GetOrCreateExtensionList();
   if (list->empty())
     return std::vector<base::string16>();
 
   std::vector<base::string16> return_value;
   for (ExtensionIdList::const_iterator it = list->begin();
        it != list->end(); ++it) {
     const Extension* extension = service_->GetInstalledExtension(*it);
@@ skipping 66 matching lines @@
 }
 
 void ExtensionMessageBubbleController::AcknowledgeExtensions() {
   ExtensionIdList* list = GetOrCreateExtensionList();
   for (ExtensionIdList::const_iterator it = list->begin();
        it != list->end(); ++it)
     delegate_->AcknowledgeExtension(*it, user_action_);
 }
 
 ExtensionIdList* ExtensionMessageBubbleController::GetOrCreateExtensionList() {
-  if (!service_)
-    return &extension_list_;  // Can occur during testing.
-
   if (!initialized_) {
     scoped_ptr<const ExtensionSet> extension_set(
         service_->GenerateInstalledExtensionsSet());
     for (ExtensionSet::const_iterator it = extension_set->begin();
          it != extension_set->end(); ++it) {
       std::string id = (*it)->id();
       if (!delegate_->ShouldIncludeExtension(id))
         continue;
       extension_list_.push_back(id);
     }
 
     delegate_->LogExtensionCount(extension_list_.size());
     initialized_ = true;
   }
 
   return &extension_list_;
 }
 
 }  // namespace extensions