Mac content shell: File > New makes a new browser window.

BUG=120153
TEST=as described

Review URL: https://chromiumcodereview.appspot.com/9965064

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130140 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 5 deletions

diff --git a/content/shell/shell_browser_context.h b/content/shell/shell_browser_context.h
index 11220b0..5dcf9b14 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);
 };