summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_message_bubble_controller.cc
diff options
context:
space:
mode:
authorfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-14 11:21:09 +0000
committerfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-14 11:21:09 +0000
commit4f2f353d842816a0897c1d29c22f806ee022dfc8 (patch)
tree114394de294383c0619c8a38647b8fb1827005ad /chrome/browser/extensions/extension_message_bubble_controller.cc
parent419704c7347853c7b707d5cb925c351f6cfdb4a2 (diff)
downloadchromium_src-4f2f353d842816a0897c1d29c22f806ee022dfc8.zip
chromium_src-4f2f353d842816a0897c1d29c22f806ee022dfc8.tar.gz
chromium_src-4f2f353d842816a0897c1d29c22f806ee022dfc8.tar.bz2
Refactor the extension message bubbles.
- Get rid of ProfileKeyedApi inheritance from the controllers. - Keep track of Profile list with base::LazyInstance. - Extract the Delegate interface out of the Controller. - Get rid of GetExtensions() function from the delegate interface. - Change the ownership model. Now: View owns Controller who owns Delegate. BUG=328441 R=kalman@chromium.org TBR=sky Review URL: https://codereview.chromium.org/134103002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244671 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_message_bubble_controller.cc')
-rw-r--r--chrome/browser/extensions/extension_message_bubble_controller.cc23
1 files changed, 10 insertions, 13 deletions
diff --git a/chrome/browser/extensions/extension_message_bubble_controller.cc b/chrome/browser/extensions/extension_message_bubble_controller.cc
index 895dc78..4a34c40 100644
--- a/chrome/browser/extensions/extension_message_bubble_controller.cc
+++ b/chrome/browser/extensions/extension_message_bubble_controller.cc
@@ -21,6 +21,15 @@
namespace extensions {
////////////////////////////////////////////////////////////////////////////////
+// ExtensionMessageBubbleController::Delegate
+
+ExtensionMessageBubbleController::Delegate::Delegate() {
+}
+
+ExtensionMessageBubbleController::Delegate::~Delegate() {
+}
+
+////////////////////////////////////////////////////////////////////////////////
// ExtensionMessageBubbleController
ExtensionMessageBubbleController::ExtensionMessageBubbleController(
@@ -29,21 +38,12 @@ ExtensionMessageBubbleController::ExtensionMessageBubbleController(
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();
@@ -130,9 +130,6 @@ void ExtensionMessageBubbleController::AcknowledgeExtensions() {
}
ExtensionIdList* ExtensionMessageBubbleController::GetOrCreateExtensionList() {
- if (!service_)
- return &extension_list_; // Can occur during testing.
-
if (!initialized_) {
scoped_ptr<const ExtensionSet> extension_set(
service_->GenerateInstalledExtensionsSet());