Make GTK and Aura parts orthogonal to OS parts

chrome/browser/chromeos/chrome_browser_main_chromeos.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_
 #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;
   virtual void PreMainMessageLoopStart() OVERRIDE;
   virtual void PreMainMessageLoopRun() OVERRIDE;
   virtual void PostMainMessageLoopStart() OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos);

[tfarina, 2011/10/15 22:17:29]

Can we move this to the end of private section?

 
  private:
   scoped_ptr<chromeos::BrightnessObserver> brightness_observer_;
 };
 
 #endif  // CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_