Move chromeos specific code to ChromeBrowserMainPartsChromeos

Change-Id: I77a05a62fa652a1f79a536761c037cffc2d318bb

BUG=chromium-os:103821
TEST=Make sure all chromeos tests and autotests run

Review URL: http://codereview.chromium.org/8670001

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

chrome/browser/chrome_browser_main.h

@@ -56,6 +56,9 @@ class ChromeBrowserMainParts : public content::BrowserMainParts {
       const content::MainFunctionParams& parameters);
 
   // content::BrowserMainParts overrides.
+  // These are called in-order by content::BrowserMainLoop.
+  // Each stage calls the same stages in any ChromeBrowserMainExtraParts added
+  // with AddParts() from ChromeContentBrowserClient::CreateBrowserMainParts.
   virtual void PreEarlyInitialization() OVERRIDE;
   virtual void PostEarlyInitialization() OVERRIDE;
   virtual void ToolkitInitialized() OVERRIDE;
@@ -71,6 +74,13 @@ class ChromeBrowserMainParts : public content::BrowserMainParts {
   virtual void PostStopThread(content::BrowserThread::ID identifier) OVERRIDE;
   virtual void PostDestroyThreads() OVERRIDE;
 
+  // Additional stages for ChromeBrowserMainExtraParts. These stages are called
+  // in order from PreMainMessageLoopStart(). See implementation for details.
+  virtual void PreProfileInit();
+  virtual void PostProfileInit();
+  virtual void PreBrowserStart();
+  virtual void PostBrowserStart();
+
   // Displays a warning message that we can't find any locale data files.
   virtual void ShowMissingLocaleMessageBox() = 0;
 
@@ -82,6 +92,7 @@ class ChromeBrowserMainParts : public content::BrowserMainParts {
   }
 
   Profile* profile() { return profile_; }
+  MetricsService* metrics() { return metrics_; }
 
  private:
   // Methods for |EarlyInitialization()| ---------------------------------------

chrome/browser/chrome_browser_main_extra_parts.cc

@@ -25,10 +25,16 @@ void ChromeBrowserMainExtraParts::PostMainMessageLoopStart() {
 void ChromeBrowserMainExtraParts::ToolkitInitialized() {
 }
 
-void ChromeBrowserMainExtraParts::PostBrowserProcessInit() {
+void ChromeBrowserMainExtraParts::PreProfileInit() {
 }
 
-void ChromeBrowserMainExtraParts::PostProfileInitialized() {
+void ChromeBrowserMainExtraParts::PostProfileInit() {
+}
+
+void ChromeBrowserMainExtraParts::PreBrowserStart() {
+}
+
+void ChromeBrowserMainExtraParts::PostBrowserStart() {
 }
 
 void ChromeBrowserMainExtraParts::PreMainMessageLoopRun() {

chrome/browser/chrome_browser_main_extra_parts.h

@@ -32,8 +32,10 @@ class ChromeBrowserMainExtraParts {
   virtual void PostMainMessageLoopStart();
 
   // MainMessageLoopRun methods.
-  virtual void PostBrowserProcessInit();
-  virtual void PostProfileInitialized();
+  virtual void PreProfileInit();
+  virtual void PostProfileInit();
+  virtual void PreBrowserStart();
+  virtual void PostBrowserStart();
   virtual void PreMainMessageLoopRun();
   virtual void PostMainMessageLoopRun();
 

chrome/browser/chrome_browser_main_extra_parts_aura.cc

@@ -16,7 +16,7 @@ ChromeBrowserMainExtraPartsAura::ChromeBrowserMainExtraPartsAura()
     : ChromeBrowserMainExtraParts() {
 }
 
-void ChromeBrowserMainExtraPartsAura::PostBrowserProcessInit() {
+void ChromeBrowserMainExtraPartsAura::PreProfileInit() {
 #if defined(OS_CHROMEOS)
   if (chromeos::system::runtime_environment::IsRunningOnChromeOS())
     aura::Desktop::set_use_fullscreen_host_window(true);

chrome/browser/chrome_browser_main_extra_parts_aura.h

@@ -13,7 +13,7 @@ class ChromeBrowserMainExtraPartsAura : public ChromeBrowserMainExtraParts {
  public:
   ChromeBrowserMainExtraPartsAura();
 
-  virtual void PostBrowserProcessInit() OVERRIDE;
+  virtual void PreProfileInit() OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsAura);

chrome/browser/chromeos/chrome_browser_main_chromeos.h

@@ -27,9 +27,14 @@ class ChromeBrowserMainPartsChromeos : public ChromeBrowserMainPartsLinux {
   virtual void PreEarlyInitialization() OVERRIDE;
   virtual void PreMainMessageLoopStart() OVERRIDE;
   virtual void PostMainMessageLoopStart() OVERRIDE;
-  virtual void PreMainMessageLoopRun() OVERRIDE;
   virtual void PostMainMessageLoopRun() OVERRIDE;
 
+  // ChromeBrowserMainExtraParts overrodes.
+  virtual void PreProfileInit() OVERRIDE;
+  virtual void PostProfileInit() OVERRIDE;
+  virtual void PreBrowserStart() OVERRIDE;
+  virtual void PostBrowserStart() OVERRIDE;
+
  private:
   scoped_ptr<chromeos::BrightnessObserver> brightness_observer_;
   scoped_ptr<chromeos::SessionManagerObserver> session_manager_observer_;