Make GTK and Aura parts orthogonal to OS parts

chrome/browser/chromeos/chrome_browser_main_chromeos.h

Index: chrome/browser/chromeos/chrome_browser_main_chromeos.h
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.h b/chrome/browser/chromeos/chrome_browser_main_chromeos.h
index 2786642e3bdbabe036705ecc2a39ede79547f3b2..783cddec763939f63fbd5bc857929f54999a59ea 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.h
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.h
@@ -6,34 +6,27 @@
 #define CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_
 
 #include "base/memory/scoped_ptr.h"
-#if defined(TOOLKIT_USES_GTK)
-#include "chrome/browser/chrome_browser_main_gtk.h"
-typedef ChromeBrowserMainPartsGtk ChromeBrowserMainPartsBase;
-#else
-#include "chrome/browser/chrome_browser_main_posix.h"
-#include "chrome/browser/chrome_browser_main_x11.h"
-typedef ChromeBrowserMainPartsPosix ChromeBrowserMainPartsBase;
-#endif
+#include "chrome/browser/chrome_browser_main_linux.h"
 
 namespace chromeos {
 class BrightnessObserver;
 class SessionManagerObserver;
 }  // namespace chromeos
 
-class ChromeBrowserMainPartsChromeos : public ChromeBrowserMainPartsBase {
+class ChromeBrowserMainPartsChromeos : public ChromeBrowserMainPartsLinux {
  public:
   explicit ChromeBrowserMainPartsChromeos(const MainFunctionParams& parameters);
-
   virtual ~ChromeBrowserMainPartsChromeos();
 
   virtual void PreEarlyInitialization() OVERRIDE;
   virtual void PreMainMessageLoopStart() OVERRIDE;
-  virtual void PreMainMessageLoopRun() OVERRIDE;
+  virtual int PreMainMessageLoopRun() OVERRIDE;
   virtual void PostMainMessageLoopStart() OVERRIDE;
 
  private:
   scoped_ptr<chromeos::BrightnessObserver> brightness_observer_;
   scoped_ptr<chromeos::SessionManagerObserver> session_manager_observer_;
+
   DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos);
 };