| 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 15c123d04816a0dd269773770957a77d9eeee182..81e8b9457471622699253a7cf8fb49b58f438aa0 100644
|
| --- a/content/shell/browser/shell_browser_context.h
|
| +++ b/content/shell/browser/shell_browser_context.h
|
| @@ -94,19 +94,20 @@
|
| url_request_getter_ = getter;
|
| }
|
|
|
| + scoped_ptr<ShellResourceContext> resource_context_;
|
| +
|
| + private:
|
| +
|
| // Performs initialization of the ShellBrowserContext while IO is still
|
| // allowed on the current thread.
|
| - virtual void InitWhileIOAllowed();
|
| + void InitWhileIOAllowed();
|
|
|
| - scoped_ptr<ShellResourceContext> resource_context_;
|
| - bool ignore_certificate_errors_;
|
| - scoped_ptr<ShellDownloadManagerDelegate> download_manager_delegate_;
|
| -
|
| - private:
|
| bool off_the_record_;
|
| net::NetLog* net_log_;
|
| + bool ignore_certificate_errors_;
|
| base::FilePath path_;
|
| BrowserPluginGuestManager* guest_manager_;
|
| + scoped_ptr<ShellDownloadManagerDelegate> download_manager_delegate_;
|
| scoped_refptr<ShellURLRequestContextGetter> url_request_getter_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ShellBrowserContext);
|
|
|