| Index: chrome/browser/content_settings/tab_specific_content_settings.h
|
| diff --git a/chrome/browser/content_settings/tab_specific_content_settings.h b/chrome/browser/content_settings/tab_specific_content_settings.h
|
| index ab3719db04ee4c2c6c8d965f269aad9f0e30209a..152533bca20698a76f9c88e69e59cbd627aa2042 100644
|
| --- a/chrome/browser/content_settings/tab_specific_content_settings.h
|
| +++ b/chrome/browser/content_settings/tab_specific_content_settings.h
|
| @@ -17,6 +17,7 @@
|
| #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"
|
| @@ -169,6 +170,25 @@ class TabSpecificContentSettings : public content::WebContentsObserver,
|
| return geolocation_settings_state_;
|
| }
|
|
|
| + // Call to indicate that there is a protocol handler pending user approval.
|
| + void SetPendingProtocolHandler(const ProtocolHandler& handler) {
|
| + pending_protocol_handler_ = handler;
|
| + }
|
| +
|
| + const ProtocolHandler& GetPendingProtocolHandler() const {
|
| + return pending_protocol_handler_;
|
| + }
|
| +
|
| + // Sets the previous protocol handler which will be replaced by the
|
| + // pending protocol handler.
|
| + void SetPreviousProtocolHandler(const ProtocolHandler& handler) {
|
| + previous_protocol_handler_ = handler;
|
| + }
|
| +
|
| + const ProtocolHandler& GetPreviousProtocolHandler() const {
|
| + return previous_protocol_handler_;
|
| + }
|
| +
|
| // Returns a pointer to the |LocalSharedObjectsContainer| that contains all
|
| // allowed local shared objects like cookies, local storage, ... .
|
| const LocalSharedObjectsContainer& allowed_local_shared_objects() const {
|
| @@ -280,6 +300,17 @@ class TabSpecificContentSettings : public content::WebContentsObserver,
|
| // 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_;
|
| +
|
| // Stores whether the user can load blocked plugins on this page.
|
| bool load_plugins_link_enabled_;
|
|
|
|
|