Add basic Chrome interaction with the mash shelf.

chrome/browser/ui/ash/ash_util.cc

Index: chrome/browser/ui/ash/ash_util.cc
diff --git a/chrome/browser/ui/ash/ash_util.cc b/chrome/browser/ui/ash/ash_util.cc
index d069db8dab60d7383ff808de2bdb3aed9a5c2732..6f3f395a6044e32cc9c8c8b82156e31de290620f 100644
--- a/chrome/browser/ui/ash/ash_util.cc
+++ b/chrome/browser/ui/ash/ash_util.cc
@@ -17,11 +17,17 @@
 namespace chrome {
 
 bool ShouldOpenAshOnStartup() {
+#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();
-#elif defined(OS_CHROMEOS)
-  return true;
+  return content::MojoShellConnection::Get() &&
+         content::MojoShellConnection::Get()->UsingExternalShell();
 #else
   return false;
 #endif