content/browser/mock_content_browser_client.h - Issue 9566035: Move QuotaPermissionContext to content/public/browser and put it in the content namespace.

Unified Diff: content/browser/mock_content_browser_client.h

Issue 9566035: Move QuotaPermissionContext to content/public/browser and put it in the content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 8 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chrome_quota_permission_context.cc ('k') | content/browser/mock_content_browser_client.cc » ('j') | content/public/browser/quota_permission_context.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/mock_content_browser_client.h

diff --git a/content/browser/mock_content_browser_client.h b/content/browser/mock_content_browser_client.h

index 62ee8b6762f72109911bc0ab2fb3dd13e9773171..7ab3111910b84f3cafdd110d83ac78b69efa5303 100644

--- a/content/browser/mock_content_browser_client.h

+++ b/content/browser/mock_content_browser_client.h

@@ -22,7 +22,7 @@ class MockContentBrowserClient : public ContentBrowserClient {

virtual ~MockContentBrowserClient();

virtual BrowserMainParts* CreateBrowserMainParts(

- const content::MainFunctionParams& parameters) OVERRIDE;

+ const MainFunctionParams& parameters) OVERRIDE;

virtual WebContentsView* CreateWebContentsView(

WebContents* web_contents) OVERRIDE;

virtual void RenderViewHostCreated(

@@ -30,7 +30,7 @@ class MockContentBrowserClient : public ContentBrowserClient {

virtual void RenderProcessHostCreated(

RenderProcessHost* host) OVERRIDE;

virtual WebUIControllerFactory* GetWebUIControllerFactory() OVERRIDE;

- virtual GURL GetEffectiveURL(content::BrowserContext* browser_context,

+ virtual GURL GetEffectiveURL(BrowserContext* browser_context,

const GURL& url) OVERRIDE;

virtual bool ShouldUseProcessPerSite(BrowserContext* browser_context,

const GURL& effective_url) OVERRIDE;

@@ -48,40 +48,38 @@ class MockContentBrowserClient : public ContentBrowserClient {

virtual void AppendExtraCommandLineSwitches(CommandLine* command_line,

int child_process_id) OVERRIDE;

virtual std::string GetApplicationLocale() OVERRIDE;

- virtual std::string GetAcceptLangs(

- content::BrowserContext* context) OVERRIDE;

+ virtual std::string GetAcceptLangs(BrowserContext* context) OVERRIDE;

virtual SkBitmap* GetDefaultFavicon() OVERRIDE;

virtual bool AllowAppCache(const GURL& manifest_url,

const GURL& first_party,

- content::ResourceContext* context) OVERRIDE;

+ ResourceContext* context) OVERRIDE;

virtual bool AllowGetCookie(const GURL& url,

const GURL& first_party,

const net::CookieList& cookie_list,

- content::ResourceContext* context,

+ ResourceContext* context,

int render_process_id,

int render_view_id) OVERRIDE;

virtual bool AllowSetCookie(const GURL& url,

const GURL& first_party,

const std::string& cookie_line,

- content::ResourceContext* context,

+ ResourceContext* context,

int render_process_id,

int render_view_id,

net::CookieOptions* options) OVERRIDE;

- virtual bool AllowSaveLocalState(

- content::ResourceContext* context) OVERRIDE;

+ virtual bool AllowSaveLocalState(ResourceContext* context) OVERRIDE;

virtual bool AllowWorkerDatabase(

const GURL& url,

const string16& name,

const string16& display_name,

unsigned long estimated_size,

- content::ResourceContext* context,

+ ResourceContext* context,

const std::vector<std::pair<int, int> >& render_views) OVERRIDE;

virtual bool AllowWorkerFileSystem(

const GURL& url,

- content::ResourceContext* context,

+ ResourceContext* context,

const std::vector<std::pair<int, int> >& render_views) OVERRIDE;

virtual net::URLRequestContext* OverrideRequestContextForURL(

- const GURL& url, content::ResourceContext* context) OVERRIDE;

+ const GURL& url, ResourceContext* context) OVERRIDE;

virtual QuotaPermissionContext* CreateQuotaPermissionContext() OVERRIDE;

virtual void OpenItem(const FilePath& path) OVERRIDE;

virtual void ShowItemInFolder(const FilePath& path) OVERRIDE;

@@ -106,8 +104,8 @@ class MockContentBrowserClient : public ContentBrowserClient {

int render_process_id,

int render_view_id) OVERRIDE;

virtual void RequestMediaAccessPermission(

- const content::MediaStreamRequest* request,

- const content::MediaResponseCallback& callback) OVERRIDE;

+ const MediaStreamRequest* request,

+ const MediaResponseCallback& callback) OVERRIDE;

virtual void RequestDesktopNotificationPermission(

const GURL& source_origin,

int callback_context,

@@ -116,7 +114,7 @@ class MockContentBrowserClient : public ContentBrowserClient {

virtual WebKit::WebNotificationPresenter::Permission

CheckDesktopNotificationPermission(

const GURL& source_origin,

- content::ResourceContext* context,

+ ResourceContext* context,

int render_process_id) OVERRIDE;

virtual void ShowDesktopNotification(

const content::ShowDesktopNotificationHostMsgParams& params,

@@ -130,10 +128,10 @@ class MockContentBrowserClient : public ContentBrowserClient {

virtual bool CanCreateWindow(

const GURL& source_origin,

WindowContainerType container_type,

- content::ResourceContext* context,

+ ResourceContext* context,

int render_process_id) OVERRIDE;

- virtual std::string GetWorkerProcessTitle(

- const GURL& url, content::ResourceContext* context) OVERRIDE;

+ virtual std::string GetWorkerProcessTitle(const GURL& url,

+ ResourceContext* context) OVERRIDE;

virtual void ResourceDispatcherHostCreated() OVERRIDE;

virtual SpeechInputManagerDelegate* GetSpeechInputManagerDelegate() OVERRIDE;

virtual ui::Clipboard* GetClipboard() OVERRIDE;