Revert 275229 "Add an extension override bubble and warning box ..."

trunk/src/extensions/browser/extension_prefs.cc

 // Copyright 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 "extensions/browser/extension_prefs.h"
 
 #include <iterator>
 
 #include "base/command_line.h"
 #include "base/prefs/pref_notifier.h"
@@ skipping 60 matching lines @@
 // The count of how many times we prompted the user to acknowledge an
 // extension.
 const char kPrefAcknowledgePromptCount[] = "ack_prompt_count";
 
 // Indicates whether the user has acknowledged various types of extensions.
 const char kPrefExternalAcknowledged[] = "ack_external";
 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.
 const char kPrefExternalInstallFirstRun[] = "external_first_run";
 
 // Indicates whether to show an install warning when the user enables.
 const char kExtensionDidEscalatePermissions[] = "install_warning_on_enable";
 
 // DO NOT USE, use kPrefDisableReasons instead.
 // Indicates whether the extension was updated while it was disabled.
@@ skipping 657 matching lines @@
 }
 
 void ExtensionPrefs::SetNtpOverriddenBubbleBeenAcknowledged(
     const std::string& extension_id,
     bool value) {
   UpdateExtensionPref(extension_id,
                       kPrefNtpBubbleAcknowledged,
                       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;
   }
   prefs_->SetBoolean(pref_names::kAlertsInitialized, true);
   return false;
 }
 
 bool ExtensionPrefs::ExtensionsBlacklistedByDefault() const {
   return admin_policy::BlacklistedByDefault(
@@ skipping 1446 matching lines @@
   extension_pref_value_map_->RegisterExtension(
       extension_id, install_time, is_enabled, is_incognito_enabled);
 
   FOR_EACH_OBSERVER(
       ExtensionPrefsObserver,
       observer_list_,
       OnExtensionRegistered(extension_id, install_time, is_enabled));
 }
 
 }  // namespace extensions