Add an extension override bubble and warning box for proxy extensions. (2nd attempt, this time with two one-liner test fixes)

Also use the browser action highlighting for extensions that have a browser action icon.

NOTE: This CL was already green-lighted here:
https://codereview.chromium.org/288923004/

BUG=381291
TBR=sky, devlin, dbeam

Review URL: https://codereview.chromium.org/320633002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275577 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 21 insertions, 0 deletions

diff --git a/extensions/browser/extension_prefs.cc b/extensions/browser/extension_prefs.cc
index fdba64a..d8a2d8a 100644
--- a/extensions/browser/extension_prefs.cc
+++ b/extensions/browser/extension_prefs.cc
@@ -78,6 +78,7 @@ const char kPrefBlacklistAcknowledged[] = "ack_blacklist";
 const char kPrefWipeoutAcknowledged[] = "ack_wiped";
 const char kPrefSettingsBubbleAcknowledged[] = "ack_settings_bubble";
 const char kPrefNtpBubbleAcknowledged[] = "ack_ntp_bubble";
+const char kPrefProxyBubbleAcknowledged[] = "ack_proxy_bubble";
 
 // Indicates whether the external extension was installed during the first
 // run of this profile.
@@ -755,6 +756,19 @@ void ExtensionPrefs::SetNtpOverriddenBubbleBeenAcknowledged(
                       value ? base::Value::CreateBooleanValue(value) : NULL);
 }
 
+bool ExtensionPrefs::HasProxyOverriddenBubbleBeenAcknowledged(
+    const std::string& extension_id) {
+  return ReadPrefAsBooleanAndReturn(extension_id, kPrefProxyBubbleAcknowledged);
+}
+
+void ExtensionPrefs::SetProxyOverriddenBubbleBeenAcknowledged(
+    const std::string& extension_id,
+    bool value) {
+  UpdateExtensionPref(extension_id,
+                      kPrefProxyBubbleAcknowledged,
+                      value ? base::Value::CreateBooleanValue(value) : NULL);
+}
+
 bool ExtensionPrefs::SetAlertSystemFirstRun() {
   if (prefs_->GetBoolean(pref_names::kAlertsInitialized)) {
     return true;
diff --git a/extensions/browser/extension_prefs.h b/extensions/browser/extension_prefs.h
index 069b604..50bb03b 100644
--- a/extensions/browser/extension_prefs.h
+++ b/extensions/browser/extension_prefs.h
@@ -329,6 +329,13 @@ class ExtensionPrefs : public ExtensionScopedPrefs, public KeyedService {
   void SetNtpOverriddenBubbleBeenAcknowledged(const std::string& extension_id,
                                               bool value);
 
+  // Whether the user has been notified about extension with |extension_id|
+  // overriding the proxy.
+  bool HasProxyOverriddenBubbleBeenAcknowledged(
+      const std::string& extension_id);
+  void SetProxyOverriddenBubbleBeenAcknowledged(const std::string& extension_id,
+                                                bool value);
+
   // Returns true if the extension notification code has already run for the
   // first time for this profile. Currently we use this flag to mean that any
   // extensions that would trigger notifications should get silently