Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3748)

Unified Diff: content/shell/browser/shell_browser_context.h

Issue 258373002: Towards moving guest management to chrome: Introduce GuestViewManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed John's comments Created 6 years, 8 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
Index: content/shell/browser/shell_browser_context.h
diff --git a/content/shell/browser/shell_browser_context.h b/content/shell/browser/shell_browser_context.h
index 3bd5192f850e20e7cd505d3d76d68c54591ad5af..b7f3bac868ebb19140a21d59222f779f420dcb35 100644
--- a/content/shell/browser/shell_browser_context.h
+++ b/content/shell/browser/shell_browser_context.h
@@ -29,6 +29,11 @@ class ShellBrowserContext : public BrowserContext {
ShellBrowserContext(bool off_the_record, net::NetLog* net_log);
virtual ~ShellBrowserContext();
+ static void set_guest_manager_delegate_for_testing(
+ BrowserPluginGuestManagerDelegate* guest_manager_delegate) {
+ ShellBrowserContext::guest_manager_delegate_ = guest_manager_delegate;
jam 2014/05/02 22:24:47 why is this a static method?
Fady Samuel 2014/05/03 00:16:59 Made it non-static
+ }
+
// BrowserContext implementation.
virtual base::FilePath GetPath() const OVERRIDE;
virtual bool IsOffTheRecord() const OVERRIDE;
@@ -67,6 +72,8 @@ class ShellBrowserContext : public BrowserContext {
virtual ResourceContext* GetResourceContext() OVERRIDE;
virtual GeolocationPermissionContext*
GetGeolocationPermissionContext() OVERRIDE;
+ virtual content::BrowserPluginGuestManagerDelegate*
+ GetGuestManagerDelegate() OVERRIDE;
virtual quota::SpecialStoragePolicy* GetSpecialStoragePolicy() OVERRIDE;
net::URLRequestContextGetter* CreateRequestContext(
@@ -89,6 +96,7 @@ class ShellBrowserContext : public BrowserContext {
net::NetLog* net_log_;
bool ignore_certificate_errors_;
base::FilePath path_;
+ static BrowserPluginGuestManagerDelegate* guest_manager_delegate_;
jam 2014/05/02 22:24:47 ditto re static
Fady Samuel 2014/05/03 00:16:59 Done.
scoped_ptr<ShellResourceContext> resource_context_;
scoped_ptr<ShellDownloadManagerDelegate> download_manager_delegate_;
scoped_refptr<ShellURLRequestContextGetter> url_request_getter_;

Powered by Google App Engine
This is Rietveld 408576698