More Aura fixes to build with chromeos==1

chrome/browser/chrome_browser_main_aura.cc

Index: chrome/browser/chrome_browser_main_aura.cc
diff --git a/chrome/browser/chrome_browser_main_aura.cc b/chrome/browser/chrome_browser_main_aura.cc
index 3f1927fa752936adf166a65e3d6d51b274d3b84f..78a4c1f5cc8e6232ada97c3379774bff35ebc6fc 100644
--- a/chrome/browser/chrome_browser_main_aura.cc
+++ b/chrome/browser/chrome_browser_main_aura.cc
@@ -4,7 +4,12 @@
 
 #include "chrome/browser/chrome_browser_main_aura.h"
 
+#include "base/command_line.h"
 #include "base/logging.h"
+#include "chrome/browser/chromeos/cros/cros_library.h"

[sky, 2011/10/12 00:04:34]

Should your includes be #ifdefed too?

[Emmanuel Saint-loubert-Bié, 2011/10/12 00:21:28]

Done.

+#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
+#include "chrome/common/chrome_switches.h"
+#include "content/common/main_function_params.h"
 
 ChromeBrowserMainPartsAura::ChromeBrowserMainPartsAura(
     const MainFunctionParams& parameters)
@@ -12,12 +17,35 @@ ChromeBrowserMainPartsAura::ChromeBrowserMainPartsAura(
   NOTIMPLEMENTED();
 }
 
+ChromeBrowserMainPartsAura::~ChromeBrowserMainPartsAura() {
+#if defined(OS_CHROMEOS)
+  chromeos::DBusThreadManager::Shutdown();
+  if (!parameters().ui_task && chromeos::CrosLibrary::Get())
+    chromeos::CrosLibrary::Shutdown();
+#endif
+}
+
 void ChromeBrowserMainPartsAura::PreEarlyInitialization() {
   NOTIMPLEMENTED();
 }
 
+void ChromeBrowserMainPartsAura::PreMainMessageLoopStart() {
+  NOTIMPLEMENTED();

[sky, 2011/10/12 00:04:34]

Do we still need the NOTIMPLEMENTEDs here and in PostMainMessageLoopStart?

[Emmanuel Saint-loubert-Bié, 2011/10/12 00:21:28]

Done.

+#if defined(OS_CHROMEOS)
+  if (!parameters().ui_task) {
+    bool use_stub = parameters().command_line_.HasSwitch(switches::kStubCros);
+    chromeos::CrosLibrary::Initialize(use_stub);
+  }
+#endif
+}
+
 void ChromeBrowserMainPartsAura::PostMainMessageLoopStart() {
   NOTIMPLEMENTED();
+#if defined(OS_CHROMEOS)
+  // Initialize DBusThreadManager for the browser. This must be done after
+  // the main message loop is started, as it uses the message loop.
+  chromeos::DBusThreadManager::Initialize();
+#endif
 }
 
 void ShowMissingLocaleMessageBox() {