Revert 147045 - Bring up a content settings icon for ungestured registerProtocolHandler call.

chrome/browser/content_settings/tab_specific_content_settings.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
 #define CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
 
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "chrome/browser/content_settings/local_shared_objects_container.h"
 #include "chrome/browser/geolocation/geolocation_settings_state.h"
 #include "chrome/common/content_settings.h"
 #include "chrome/common/content_settings_types.h"
-#include "chrome/common/custom_handlers/protocol_handler.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_observer.h"
 
 class CookiesTreeModel;
 class Profile;
 
 namespace content {
 class RenderViewHost;
 }
@@ skipping 132 matching lines @@
 
   const std::set<std::string>& BlockedResourcesForType(
       ContentSettingsType content_type) const;
 
   // Returns the GeolocationSettingsState that controls the
   // geolocation API usage on this page.
   const GeolocationSettingsState& geolocation_settings_state() const {
     return geolocation_settings_state_;
   }
 
-  // Call to indicate that there is a protocol handler pending user approval.
-  void set_pending_protocol_handler(const ProtocolHandler& handler) {
-    pending_protocol_handler_ = handler;
-  }
-
-  const ProtocolHandler& pending_protocol_handler() const {
-    return pending_protocol_handler_;
-  }
-
-  void ClearPendingProtocolHandler() {
-    pending_protocol_handler_ = ProtocolHandler::EmptyProtocolHandler();
-  }
-
-
-  // Sets the previous protocol handler which will be replaced by the
-  // pending protocol handler.
-  void set_previous_protocol_handler(const ProtocolHandler& handler) {
-    previous_protocol_handler_ = handler;
-  }
-
-  const ProtocolHandler& previous_protocol_handler() const {
-    return previous_protocol_handler_;
-  }
-
-  // Set whether the setting for the pending handler is DEFAULT (ignore),
-  // ALLOW, or DENY.
-  void set_pending_protocol_handler_setting(ContentSetting setting) {
-    pending_protocol_handler_setting_ = setting;
-  }
-
-  ContentSetting pending_protocol_handler_setting() const {
-    return pending_protocol_handler_setting_;
-  }
-
-
   // Returns a pointer to the |LocalSharedObjectsContainer| that contains all
   // allowed local shared objects like cookies, local storage, ... .
   const LocalSharedObjectsContainer& allowed_local_shared_objects() const {
     return allowed_local_shared_objects_;
   }
 
   // Returns a pointer to the |LocalSharedObjectsContainer| that contains all
   // blocked local shared objects like cookies, local storage, ... .
   const LocalSharedObjectsContainer& blocked_local_shared_objects() const {
     return blocked_local_shared_objects_;
@@ skipping 91 matching lines @@
   // The profile of the tab.
   Profile* profile_;
 
   // Stores the blocked/allowed cookies.
   LocalSharedObjectsContainer allowed_local_shared_objects_;
   LocalSharedObjectsContainer blocked_local_shared_objects_;
 
   // Manages information about Geolocation API usage in this page.
   GeolocationSettingsState geolocation_settings_state_;
 
-  // The pending protocol handler, if any. This can be set if
-  // registerProtocolHandler was invoked without user gesture.
-  // The |IsEmpty| method will be true if no protocol handler is
-  // pending registration.
-  ProtocolHandler pending_protocol_handler_;
-
-  // The previous protocol handler to be replaced by
-  // the pending_protocol_handler_, if there is one. Empty if
-  // there is no handler which would be replaced.
-  ProtocolHandler previous_protocol_handler_;
-
-  // The setting on the pending protocol handler registration. Persisted in case
-  // the user opens the bubble and makes changes multiple times.
-  ContentSetting pending_protocol_handler_setting_;
-
   // Stores whether the user can load blocked plugins on this page.
   bool load_plugins_link_enabled_;
 
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(TabSpecificContentSettings);
 };
 
 #endif  // CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_