Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(634)

Unified Diff: chrome/browser/extensions/settings_api_bubble_controller.cc

Issue 288923004: Add an extension override bubble and warning box for proxy extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/settings_api_bubble_controller.cc
diff --git a/chrome/browser/extensions/settings_api_bubble_controller.cc b/chrome/browser/extensions/settings_api_bubble_controller.cc
index b795d88606a710b2b2c2debe2de47d34f0ed4a37..96e8e374bd7e337ab1505d679dad2c5109f3daa3 100644
--- a/chrome/browser/extensions/settings_api_bubble_controller.cc
+++ b/chrome/browser/extensions/settings_api_bubble_controller.cc
@@ -6,6 +6,7 @@
#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"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/startup/startup_browser_creator.h"
@@ -20,6 +21,7 @@
using extensions::ExtensionMessageBubbleController;
using extensions::SettingsApiBubbleController;
using extensions::SettingsOverrides;
+using extensions::ExtensionToolbarModel;
Devlin 2014/05/20 17:26:31 Why not move extensions namespace up?
Finnur 2014/05/21 16:30:32 Done.
namespace {
@@ -41,6 +43,7 @@ class SettingsApiBubbleDelegate
extensions::ExtensionMessageBubbleController::BubbleAction user_action)
OVERRIDE;
virtual void PerformAction(const extensions::ExtensionIdList& list) OVERRIDE;
+ virtual void OnClose() OVERRIDE;
virtual base::string16 GetTitle() const OVERRIDE;
virtual base::string16 GetMessageBody() const OVERRIDE;
virtual base::string16 GetOverflowText(
@@ -132,6 +135,12 @@ void SettingsApiBubbleDelegate::PerformAction(
}
}
+void SettingsApiBubbleDelegate::OnClose() {
+ ExtensionToolbarModel* toolbar_model = ExtensionToolbarModel::Get(profile_);
+ if (toolbar_model)
+ toolbar_model->StopHighlighting();
+}
+
base::string16 SettingsApiBubbleDelegate::GetTitle() const {
switch (type_) {
case extensions::BUBBLE_TYPE_HOME_PAGE:

Powered by Google App Engine
This is Rietveld 408576698