Prepare status area to support multiple trays.

ash/shell/content_client/shell_browser_main_parts.cc

 // Copyright (c) 2012 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.
 
 #include "ash/shell/content_client/shell_browser_main_parts.h"
 
 #include "ash/shell/shell_delegate_impl.h"
 #include "ash/shell/window_watcher.h"
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 14 matching lines @@
 #include "ui/base/ui_base_paths.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/test/compositor_test_support.h"
 #include "ui/views/focus/accelerator_handler.h"
 #include "ui/views/test/test_views_delegate.h"
 
 #if defined(OS_LINUX)
 #include "ui/base/touch/touch_factory.h"
 #endif
 
+#if defined(OS_CHROMEOS)
+#include "chromeos/dbus/dbus_thread_manager.h"
+#endif
+
 namespace ash {
 namespace shell {
 void InitWindowTypeLauncher();
 
 namespace {
 class ShellViewsDelegate : public views::TestViewsDelegate {
  public:
   ShellViewsDelegate() {}
   virtual ~ShellViewsDelegate() {}
 
@@ skipping 22 matching lines @@
 }
 
 #if !defined(OS_MACOSX)
 void ShellBrowserMainParts::PreMainMessageLoopStart() {
 #if defined(OS_LINUX)
   ui::TouchFactory::SetTouchDeviceListFromCommandLine();
 #endif
 }
 #endif
 
+void ShellBrowserMainParts::PostMainMessageLoopStart() {
+#if defined(OS_CHROMEOS)
+  chromeos::DBusThreadManager::Initialize();

[stevenjb, 2012/06/11 20:47:01]

Needed for TraySms. Was causing ash_shell to crash when run with --ash-notify.

+#endif
+}
+
 void ShellBrowserMainParts::PreMainMessageLoopRun() {
   browser_context_.reset(new content::ShellBrowserContext);
 
   // A ViewsDelegate is required.
   if (!views::ViewsDelegate::views_delegate)
     views::ViewsDelegate::views_delegate = new ShellViewsDelegate;
 
   ash::shell::ShellDelegateImpl* delegate = new ash::shell::ShellDelegateImpl;
   ash::Shell::CreateInstance(delegate);
   ash::Shell::GetInstance()->set_browser_context(browser_context_.get());
@@ skipping 14 matching lines @@
   aura::Env::DeleteInstance();
 }
 
 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) {
   MessageLoopForUI::current()->Run();
   return true;
 }
 
 }  // namespace shell
 }  // namespace ash