Merge pull request #40 from brightray/default-browser-client

Create a BrowserClient by default
electron · Dec 3, 2013 · 873f52f · 873f52f
2 parents 837bd78 + 1c56afe
commit 873f52f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/brightray/common/main_delegate.cc b/brightray/common/main_delegate.cc
@@ -58,4 +58,13 @@ void MainDelegate::InitializeResourceBundle() {
   }
 }
 
+content::ContentBrowserClient* MainDelegate::CreateContentBrowserClient() {
+  browser_client_ = CreateBrowserClient().Pass();
+  return browser_client_.get();
+}
+
+scoped_ptr<BrowserClient> MainDelegate::CreateBrowserClient() {
+  return make_scoped_ptr(new BrowserClient).Pass();
+}
+
 }  // namespace brightray
diff --git a/brightray/common/main_delegate.h b/brightray/common/main_delegate.h
@@ -17,6 +17,7 @@ class FilePath;
 
 namespace brightray {
 
+class BrowserClient;
 class ContentClient;
 
 class MainDelegate : public content::ContentMainDelegate {
@@ -29,6 +30,10 @@ class MainDelegate : public content::ContentMainDelegate {
   // implementation.
   virtual scoped_ptr<ContentClient> CreateContentClient();
 
+  // Subclasses can override this to provide their own BrowserClient
+  // implementation.
+  virtual scoped_ptr<BrowserClient> CreateBrowserClient();
+
   // Subclasses can override this to provide additional .pak files to be
   // included in the ui::ResourceBundle.
   virtual void AddPakPaths(std::vector<base::FilePath>* pak_paths) {}
@@ -37,6 +42,8 @@ class MainDelegate : public content::ContentMainDelegate {
   virtual void PreSandboxStartup() OVERRIDE;
 
  private:
+  virtual content::ContentBrowserClient* CreateContentBrowserClient() OVERRIDE;
+
   void InitializeResourceBundle();
 #if defined(OS_MACOSX)
   static base::FilePath GetResourcesPakFilePath();
@@ -45,6 +52,7 @@ class MainDelegate : public content::ContentMainDelegate {
 #endif
 
   scoped_ptr<ContentClient> content_client_;
+  scoped_ptr<BrowserClient> browser_client_;
 
   DISALLOW_COPY_AND_ASSIGN(MainDelegate);
 };