Add basic Chrome interaction with the mash shelf.

chrome/browser/ui/ash/ash_init.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 "chrome/browser/ui/ash/ash_init.h"
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/ash_switches.h"
 #include "ash/high_contrast/high_contrast_controller.h"
 #include "ash/magnifier/magnification_controller.h"
@@ skipping 20 matching lines @@
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
 #include "chrome/browser/ui/ash/ime_controller_chromeos.h"
 #include "chrome/browser/ui/ash/volume_controller_chromeos.h"
 #include "chromeos/accelerometer/accelerometer_reader.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/login/login_state.h"
 #include "ui/base/x/x11_util.h"
 #endif
 
+#if defined(MOJO_SHELL_CLIENT)
+#include "chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.h"
+#endif
+
 namespace chrome {
 
 void OpenAsh(gfx::AcceleratedWidget remote_window) {
 #if defined(OS_CHROMEOS)
 #if defined(USE_X11)
   if (base::SysInfo::IsRunningOnChromeOS()) {
     // Hides the cursor outside of the Aura root window. The cursor will be
     // drawn within the Aura root window, and it'll remain hidden after the
     // Aura window is closed.
     ui::HideHostCursor();
@@ skipping 43 matching lines @@
       SetEnabled(magnifier_enabled && magnifier_type == ui::MAGNIFIER_PARTIAL);
 
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableZeroBrowsersOpenForTests)) {
     g_browser_process->platform_part()->RegisterKeepAlive();
   }
 #endif
   ash::Shell::GetPrimaryRootWindow()->GetHost()->Show();
 }
 
+void InitializeMash() {
+#if defined(MOJO_SHELL_CLIENT)
+  DCHECK(!ash::Shell::HasInstance());
+  ChromeMashShelfController::CreateInstance();
+#endif
+}
+
 void CloseAsh() {
   if (ash::Shell::HasInstance()) {
     ash::Shell::DeleteInstance();
     ash::ShellContentState::DestroyInstance();
   }
 }
 
 }  // namespace chrome