Add basic Chrome interaction with the mash shelf.

chrome/browser/ui/ash/ash_util.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_util.h"
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/shell.h"
 #include "build/build_config.h"
 #include "chrome/browser/ui/ash/ash_init.h"
 #include "ui/aura/window_event_dispatcher.h"
 
 #if defined(MOJO_SHELL_CLIENT)
 #include "content/public/common/mojo_shell_connection.h"
 #endif
 
 namespace chrome {
 
 bool ShouldOpenAshOnStartup() {
-#if defined(OS_CHROMEOS) && defined(MOJO_SHELL_CLIENT)
-  return !content::MojoShellConnection::Get() ||
-         !content::MojoShellConnection::Get()->UsingExternalShell();
-#elif defined(OS_CHROMEOS)
-  return true;
+#if defined(OS_CHROMEOS)
+  return !IsRunningInMash();
 #else
   return false;
 #endif
+}
+
+bool IsRunningInMash() {
+#if defined(OS_CHROMEOS) && defined(MOJO_SHELL_CLIENT)
+  return content::MojoShellConnection::Get() &&
+         content::MojoShellConnection::Get()->UsingExternalShell();
+#else
+  return false;
+#endif
 }
 
 bool IsNativeViewInAsh(gfx::NativeView native_view) {
 #if defined(OS_CHROMEOS)
   // Optimization. There is only ash on ChromeOS.
   return true;
 #endif
 
   if (!ash::Shell::HasInstance())
     return false;
@@ skipping 14 matching lines @@
   return IsNativeViewInAsh(native_window);
 }
 
 bool IsAcceleratorDeprecated(const ui::Accelerator& accelerator) {
   ash::AcceleratorController* controller =
       ash::Shell::GetInstance()->accelerator_controller();
   return controller->IsDeprecated(accelerator);
 }
 
 }  // namespace chrome