From d4e81da19a7d0e9eefe8a159500051dc48c79fd5 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 3 Jul 2014 08:12:12 +0000
Subject: [PATCH] Make BrowserMainParts's overrides available on all platforms.

---
 brightray/browser/browser_main_parts.cc     | 15 +++++++++++++++
 brightray/browser/browser_main_parts.h      |  9 ++++++---
 brightray/browser/browser_main_parts_mac.mm |  4 ++--
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/brightray/browser/browser_main_parts.cc b/brightray/browser/browser_main_parts.cc
index ceee0d51e6..806faee861 100644
--- a/brightray/browser/browser_main_parts.cc
+++ b/brightray/browser/browser_main_parts.cc
@@ -18,6 +18,21 @@ BrowserMainParts::BrowserMainParts() {
 BrowserMainParts::~BrowserMainParts() {
 }
 
+void BrowserMainParts::PreEarlyInitialization() {
+#if defined(OS_MACOSX)
+  IncreaseFileDescriptorLimit();
+#endif
+}
+
+void BrowserMainParts::ToolkitInitialized() {
+}
+
+void BrowserMainParts::PreMainMessageLoopStart() {
+#if defined(OS_MACOSX)
+  InitializeMainNib();
+#endif
+}
+
 void BrowserMainParts::PreMainMessageLoopRun() {
   browser_context_.reset(CreateBrowserContext());
   browser_context_->Initialize();
diff --git a/brightray/browser/browser_main_parts.h b/brightray/browser/browser_main_parts.h
index 79d343ac60..fc0587f41c 100644
--- a/brightray/browser/browser_main_parts.h
+++ b/brightray/browser/browser_main_parts.h
@@ -26,16 +26,19 @@ class BrowserMainParts : public content::BrowserMainParts {
   // implementation. The caller takes ownership of the returned object.
   virtual BrowserContext* CreateBrowserContext();
 
-#if defined(OS_MACOSX)
   virtual void PreEarlyInitialization() OVERRIDE;
+  virtual void ToolkitInitialized() OVERRIDE;
   virtual void PreMainMessageLoopStart() OVERRIDE;
-#endif
-
   virtual void PreMainMessageLoopRun() OVERRIDE;
   virtual void PostMainMessageLoopRun() OVERRIDE;
   virtual int PreCreateThreads() OVERRIDE;
 
  private:
+#if defined(OS_MACOSX)
+  void IncreaseFileDescriptorLimit();
+  void InitializeMainNib();
+#endif
+
   scoped_ptr<BrowserContext> browser_context_;
   scoped_ptr<WebUIControllerFactory> web_ui_controller_factory_;
 
diff --git a/brightray/browser/browser_main_parts_mac.mm b/brightray/browser/browser_main_parts_mac.mm
index 44b9494374..a795e80a69 100644
--- a/brightray/browser/browser_main_parts_mac.mm
+++ b/brightray/browser/browser_main_parts_mac.mm
@@ -27,7 +27,7 @@ void SetFileDescriptorLimit(rlim_t max_descriptors) {
 
 }  // namespace
 
-void BrowserMainParts::PreEarlyInitialization() {
+void BrowserMainParts::IncreaseFileDescriptorLimit() {
   // We use quite a few file descriptors for our IPC, and the default limit on the Mac is low (256),
   // so bump it up.
   // See http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/chrome_browser_main_posix.cc?revision=244734#l295
@@ -36,7 +36,7 @@ void BrowserMainParts::PreEarlyInitialization() {
 }
 
 // Replicates NSApplicationMain, but doesn't start a run loop.
-void BrowserMainParts::PreMainMessageLoopStart() {
+void BrowserMainParts::InitializeMainNib() {
   auto infoDictionary = base::mac::OuterBundle().infoDictionary;
 
   auto principalClass = NSClassFromString([infoDictionary objectForKey:@"NSPrincipalClass"]);