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

Unified Diff: content/shell/shell_browser_context.h

Issue 9965064: Mac content shell: File > New makes a new browser window. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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 | « content/shell/shell_application_mac.mm ('k') | content/shell/shell_browser_context.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/shell_browser_context.h
diff --git a/content/shell/shell_browser_context.h b/content/shell/shell_browser_context.h
index 11220b0fe20c414c6602e9d822f0995f76cff161..5dcf9b14d7633b3ace43a5da5afde3f35d704d78 100644
--- a/content/shell/shell_browser_context.h
+++ b/content/shell/shell_browser_context.h
@@ -10,6 +10,7 @@
#include "base/file_path.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
+#include "base/memory/singleton.h"
#include "content/public/browser/browser_context.h"
class DownloadManager;
@@ -18,13 +19,11 @@ namespace content {
class DownloadManagerDelegate;
class ResourceContext;
-class ShellBrowserMainParts;
class ShellDownloadManagerDelegate;
class ShellBrowserContext : public BrowserContext {
public:
- explicit ShellBrowserContext(ShellBrowserMainParts* shell_main_parts);
- virtual ~ShellBrowserContext();
+ static ShellBrowserContext* GetInstance();
// BrowserContext implementation.
virtual FilePath GetPath() OVERRIDE;
@@ -43,6 +42,10 @@ class ShellBrowserContext : public BrowserContext {
virtual quota::SpecialStoragePolicy* GetSpecialStoragePolicy() OVERRIDE;
private:
+ ShellBrowserContext();
+ virtual ~ShellBrowserContext();
+ friend struct DefaultSingletonTraits<ShellBrowserContext>;
+
// Performs initialization of the ShellBrowserContext while IO is still
// allowed on the current thread.
void InitWhileIOAllowed();
@@ -55,8 +58,6 @@ class ShellBrowserContext : public BrowserContext {
scoped_refptr<GeolocationPermissionContext> geolocation_permission_context_;
scoped_refptr<SpeechRecognitionPreferences> speech_recognition_preferences_;
- ShellBrowserMainParts* shell_main_parts_;
-
DISALLOW_COPY_AND_ASSIGN(ShellBrowserContext);
};
« no previous file with comments | « content/shell/shell_application_mac.mm ('k') | content/shell/shell_browser_context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698