Make GTK and Aura parts orthogonal to OS parts

chrome/browser/chrome_browser_main.h

Index: chrome/browser/chrome_browser_main.h
diff --git a/chrome/browser/chrome_browser_main.h b/chrome/browser/chrome_browser_main.h
index 95f2fea609beba0ee0069fbb29108542c978d8ff..b7c3323e69056c56012a36a940e8121ea5d982fb 100644
--- a/chrome/browser/chrome_browser_main.h
+++ b/chrome/browser/chrome_browser_main.h
@@ -43,13 +43,29 @@ class ChromeBrowserMainParts : public content::BrowserMainParts {
  protected:
   explicit ChromeBrowserMainParts(const MainFunctionParams& parameters);
 
+  // content::BrowserParts overrides
   virtual void PreMainMessageLoopRun() OVERRIDE;
-  int PreMainMessageLoopRunInternal();
-  virtual void MainMessageLoopRun() OVERRIDE;
   virtual void PostMainMessageLoopRun() OVERRIDE;
+
+  // content::BrowserMainParts overrides
+  virtual void MainMessageLoopRun() OVERRIDE;
   virtual void ToolkitInitialized() OVERRIDE;
 
+  // New virtual methods

[DaveMoore, 2011/10/19 21:31:18]

Nit: this comment probably doesn't need to be here

+
+  // Displays a warning message that we can't find any locale data files.
+  virtual void ShowMissingLocaleMessageBox() = 0;
+  // Handles the --hide-icons and --show-icons command line options.
+  virtual int HandleIconsCommands() = 0;
+  // Check if there is any machine level Chrome installed. If so, handle it
+  // and return true.
+  virtual bool CheckMachineLevelInstall() = 0;
+  // Prepare localization, etc for handling crashes.
+  virtual void PrepareRestartOnCrashEnviroment() = 0;
+
  private:
+  int PreMainMessageLoopRunInternal();
+
   // Methods for |EarlyInitialization()| ---------------------------------------
 
   // A/B test for the maximum number of persistent connections per host.
@@ -138,9 +154,6 @@ void RecordBreakpadStatusUMA(MetricsService* metrics);
 // present on the current platform.
 void WarnAboutMinimumSystemRequirements();
 
-// Displays a warning message that we can't find any locale data files.
-void ShowMissingLocaleMessageBox();
-
 // Records the time from our process' startup to the present time in
 // the UMA histogram |metric_name|.
 void RecordBrowserStartupTime();