chromeos: Move VersionLoader into ChromeBrowserMainChromeos.

This was a TODO for stevenjb.

R=stevenjb@chromium.org
TBR=ben@chromium.org # for chrome_browser_main_linux.h

Review URL: https://chromiumcodereview.appspot.com/11499003

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

4 files changed, 35 insertions, 34 deletions

diff --git a/chrome/browser/chrome_browser_main_linux.cc b/chrome/browser/chrome_browser_main_linux.cc
index 6539647..db40bec 100644
--- a/chrome/browser/chrome_browser_main_linux.cc
+++ b/chrome/browser/chrome_browser_main_linux.cc
@@ -33,11 +33,7 @@
 namespace {
 
 #if defined(USE_LINUX_BREAKPAD)
-#if defined(OS_CHROMEOS)
-void ChromeOSVersionCallback(const std::string& version) {
-  base::SetLinuxDistro(std::string("CrOS ") + version);
-}
-#else
+#if !defined(OS_CHROMEOS)
 void GetLinuxDistroCallback() {
   base::GetLinuxDistro();  // Initialize base::linux_distro if needed.
 }
@@ -91,11 +87,7 @@ ChromeBrowserMainPartsLinux::~ChromeBrowserMainPartsLinux() {
 
 void ChromeBrowserMainPartsLinux::PreProfileInit() {
 #if defined(USE_LINUX_BREAKPAD)
-#if defined(OS_CHROMEOS)
-  cros_version_loader_.GetVersion(chromeos::VersionLoader::VERSION_FULL,
-                                  base::Bind(&ChromeOSVersionCallback),
-                                  &tracker_);
-#else
+#if !defined(OS_CHROMEOS)
   // Needs to be called after we have chrome::DIR_USER_DATA and
   // g_browser_process.  This happens in PreCreateThreads.
   content::BrowserThread::PostTask(content::BrowserThread::FILE,
diff --git a/chrome/browser/chrome_browser_main_linux.h b/chrome/browser/chrome_browser_main_linux.h
index 7c8f042..a7550e7 100644
--- a/chrome/browser/chrome_browser_main_linux.h
+++ b/chrome/browser/chrome_browser_main_linux.h
@@ -10,11 +10,6 @@
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/chrome_browser_main_posix.h"
-#include "chrome/common/cancelable_task_tracker.h"
-
-#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/version_loader.h"
-#endif
 
 #if !defined(OS_CHROMEOS)
 namespace chrome {
@@ -38,11 +33,7 @@ class ChromeBrowserMainPartsLinux : public ChromeBrowserMainPartsPosix {
   virtual void PostMainMessageLoopRun() OVERRIDE;
 
  private:
-#if defined(OS_CHROMEOS)
-  // TODO(stevenjb): Move these to ChromeBrowserMainChromeos.
-  chromeos::VersionLoader cros_version_loader_;
-  CancelableTaskTracker tracker_;
-#else
+#if !defined(OS_CHROMEOS)
   scoped_refptr<chrome::RemovableDeviceNotificationsLinux>
       removable_device_notifications_linux_;
 #endif
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 08b03bd..6df5bd3 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -13,6 +13,7 @@
 #include "base/chromeos/chromeos_version.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
+#include "base/linux_util.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
@@ -96,6 +97,13 @@ namespace chromeos {
 
 namespace {
 
+#if defined(USE_LINUX_BREAKPAD)
+void ChromeOSVersionCallback(const std::string& version) {
+  base::SetLinuxDistro(std::string("CrOS ") + version);
+}
+
+#endif
+
 class MessageLoopObserver : public MessageLoopForUI::Observer {
   virtual base::EventStatus WillProcessEvent(
       const base::NativeEvent& event) OVERRIDE {
@@ -481,6 +489,12 @@ void ChromeBrowserMainPartsChromeos::PreProfileInit() {
   // be placed after UserManager::SessionStarted();
   chromeos::MagnificationManager::Initialize();
 
+#if defined(USE_LINUX_BREAKPAD)
+  cros_version_loader_.GetVersion(VersionLoader::VERSION_FULL,
+                                  base::Bind(&ChromeOSVersionCallback),
+                                  &tracker_);
+#endif
+
   // In Aura builds this will initialize ash::Shell.
   ChromeBrowserMainPartsLinux::PreProfileInit();
 }
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.h b/chrome/browser/chromeos/chrome_browser_main_chromeos.h
index d4d41d7..358ea1d 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.h
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.h
@@ -8,10 +8,12 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chrome_browser_main_linux.h"
+#include "chrome/browser/chromeos/version_loader.h"
+#include "chrome/common/cancelable_task_tracker.h"
 
 namespace contacts {
 class ContactManager;
-}  // namespace contacts
+}
 
 namespace chromeos {
 
@@ -64,23 +66,25 @@ class ChromeBrowserMainPartsChromeos : public ChromeBrowserMainPartsLinux {
   void SetupLowMemoryHeadroomFieldTrial();
 
   scoped_ptr<contacts::ContactManager> contact_manager_;
-  scoped_ptr<chromeos::BrightnessObserver> brightness_observer_;
-  scoped_ptr<chromeos::default_app_order::ExternalLoader> app_order_loader_;
-  scoped_ptr<chromeos::OutputObserver> output_observer_;
-  scoped_ptr<chromeos::ResumeObserver> resume_observer_;
-  scoped_ptr<chromeos::ScreenLockObserver> screen_lock_observer_;
-  scoped_ptr<chromeos::PowerButtonObserver> power_button_observer_;
-  scoped_refptr<chromeos::PowerStateOverride> power_state_override_;
-  scoped_ptr<chromeos::PrimaryDisplaySwitchObserver>
-      primary_display_switch_observer_;
-  scoped_ptr<chromeos::UserActivityNotifier> user_activity_notifier_;
-  scoped_ptr<chromeos::VideoActivityNotifier> video_activity_notifier_;
-  scoped_ptr<chromeos::ScreenDimmingObserver> screen_dimming_observer_;
-  scoped_refptr<chromeos::RemovableDeviceNotificationsCros>
+  scoped_ptr<BrightnessObserver> brightness_observer_;
+  scoped_ptr<default_app_order::ExternalLoader> app_order_loader_;
+  scoped_ptr<OutputObserver> output_observer_;
+  scoped_ptr<ResumeObserver> resume_observer_;
+  scoped_ptr<ScreenLockObserver> screen_lock_observer_;
+  scoped_ptr<PowerButtonObserver> power_button_observer_;
+  scoped_refptr<PowerStateOverride> power_state_override_;
+  scoped_ptr<PrimaryDisplaySwitchObserver> primary_display_switch_observer_;
+  scoped_ptr<UserActivityNotifier> user_activity_notifier_;
+  scoped_ptr<VideoActivityNotifier> video_activity_notifier_;
+  scoped_ptr<ScreenDimmingObserver> screen_dimming_observer_;
+  scoped_refptr<RemovableDeviceNotificationsCros>
       removable_device_notifications_;
 
   scoped_ptr<internal::DBusServices> dbus_services_;
 
+  VersionLoader cros_version_loader_;
+  CancelableTaskTracker tracker_;
+
   DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos);
 };