diff options
author | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-07 12:30:06 +0000 |
---|---|---|
committer | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-07 12:30:06 +0000 |
commit | 672c8c1e10e9b8f8b3416ed812cdfeae16005505 (patch) | |
tree | 75d427330154213748efe55b8f3163603faf3de1 /chrome/browser/profiles/profile.h | |
parent | d679c866738497a6c73a7836bdf441831f024be0 (diff) | |
download | chromium_src-672c8c1e10e9b8f8b3416ed812cdfeae16005505.zip chromium_src-672c8c1e10e9b8f8b3416ed812cdfeae16005505.tar.gz chromium_src-672c8c1e10e9b8f8b3416ed812cdfeae16005505.tar.bz2 |
Add chrome-search: access from Instant overlay
Enables the Instant NTP page access to:
chrome-search://theme/*,
chrome-search://favicon/*, and
chrome-search://thumb/*.
This CL has a number of aspects to make the installed theme
background image available to the Instant overlay:
1. Utilizes the new chrome-search: scheme that is accessible only
to the Instant overlay's render process. This is enforced
on the renderer side by WebKit::WebSecurityPolicy
facilities. This is enforced on the browser side by the
InstantIOContext::ShouldServiceRequest and URLDataSource::ShouldServiceRequest facilities.
2. Whitelists the chrome-search://theme origin to be made
available to the specific Instant overlay's origin/url.
3. Backend CSS that sets the appropriate background image
that resides in the chrome-search://theme origin.
4. A small refactoring of the Instant tests to support mix-in
usage of InstantTestBase.
BUG=172408, 134937
TEST=InstantPolicyTest.SearchSchemePolicy
R=sreeram@chromium.org, creis@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=186347
Review URL: https://chromiumcodereview.appspot.com/11896113
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186680 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profiles/profile.h')
-rw-r--r-- | chrome/browser/profiles/profile.h | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/chrome/browser/profiles/profile.h b/chrome/browser/profiles/profile.h index 1256c36..a5ae599 100644 --- a/chrome/browser/profiles/profile.h +++ b/chrome/browser/profiles/profile.h @@ -14,6 +14,7 @@ #include "base/logging.h" #include "chrome/browser/net/pref_proxy_config_tracker.h" #include "content/public/browser/browser_context.h" +#include "content/public/browser/content_browser_client.h" #include "net/url_request/url_request_job_factory.h" class ChromeAppCacheService; @@ -255,16 +256,7 @@ class Profile : public content::BrowserContext { // ContextBrowserClient to call this function. // TODO(ajwong): Remove once http://crbug.com/159193 is resolved. virtual net::URLRequestContextGetter* CreateRequestContext( - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> - blob_protocol_handler, - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> - file_system_protocol_handler, - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> - developer_protocol_handler, - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> - chrome_protocol_handler, - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> - chrome_devtools_protocol_handler) = 0; + content::ProtocolHandlerMap* protocol_handlers) = 0; // Creates the net::URLRequestContextGetter for a StoragePartition. Should // only be called once per partition_path per ContentBrowserClient object. @@ -275,16 +267,7 @@ class Profile : public content::BrowserContext { virtual net::URLRequestContextGetter* CreateRequestContextForStoragePartition( const base::FilePath& partition_path, bool in_memory, - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> - blob_protocol_handler, - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> - file_system_protocol_handler, - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> - developer_protocol_handler, - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> - chrome_protocol_handler, - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> - chrome_devtools_protocol_handler) = 0; + content::ProtocolHandlerMap* protocol_handlers) = 0; // Returns the last directory that was chosen for uploading or opening a file. virtual base::FilePath last_selected_directory() = 0; |