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 f5f5f74687fdfc32e70432084991b1ce904abbd1..424ca23c60d4cf9cd46fce9fee3c76bbbc78b274 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.h
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.h
@@ -6,23 +6,15 @@
 #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;
 }  // namespace chromeos
 
-class ChromeBrowserMainPartsChromeos : public ChromeBrowserMainPartsBase {
+class ChromeBrowserMainPartsChromeos : public ChromeBrowserMainPartsLinux {
  public:
   explicit ChromeBrowserMainPartsChromeos(const MainFunctionParams& parameters);
-
   virtual ~ChromeBrowserMainPartsChromeos();
 
   virtual void PreEarlyInitialization() OVERRIDE;
@@ -30,10 +22,10 @@ class ChromeBrowserMainPartsChromeos : public ChromeBrowserMainPartsBase {
   virtual void PreMainMessageLoopRun() OVERRIDE;
   virtual void PostMainMessageLoopStart() OVERRIDE;
 
-  DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos);
-
  private:
   scoped_ptr<chromeos::BrightnessObserver> brightness_observer_;
+
+  DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos);
 };
 
 #endif  // CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_