Add basic Chrome interaction with the mash shelf.

chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc

Index: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
diff --git a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
index c356a04e7c81ebeace37f0e9f48f7b1e72592074..430c294f7f73f350a7ed4a8594782aaed9332d47 100644
--- a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
+++ b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
@@ -26,21 +26,19 @@
 #include "chrome/browser/ui/views/select_file_dialog_extension_factory.h"
 #endif
 
-ChromeBrowserMainExtraPartsAsh::ChromeBrowserMainExtraPartsAsh() {
-}
+ChromeBrowserMainExtraPartsAsh::ChromeBrowserMainExtraPartsAsh() {}
 
-ChromeBrowserMainExtraPartsAsh::~ChromeBrowserMainExtraPartsAsh() {
-}
+ChromeBrowserMainExtraPartsAsh::~ChromeBrowserMainExtraPartsAsh() {}
 
 void ChromeBrowserMainExtraPartsAsh::PreProfileInit() {
   if (chrome::ShouldOpenAshOnStartup()) {
     chrome::OpenAsh(gfx::kNullAcceleratedWidget);
-
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-  ash::Shell::GetInstance()->CreateShelf();
-  ash::Shell::GetInstance()->ShowShelf();
+    ash::Shell::GetInstance()->CreateShelf();

[James Cook, 2016/04/06 04:29:52]

Hooray for correct (auto) formatting! :-)

+    ash::Shell::GetInstance()->ShowShelf();
 #endif
   }
+
 #if defined(OS_CHROMEOS)
   // For OS_CHROMEOS, virtual keyboard needs to be initialized before profile
   // initialized. Otherwise, virtual keyboard extension will not load at login
@@ -54,6 +52,9 @@ void ChromeBrowserMainExtraPartsAsh::PreProfileInit() {
 }
 
 void ChromeBrowserMainExtraPartsAsh::PostProfileInit() {
+  if (chrome::IsRunningInMash())
+    chrome::InitializeMash();
+
   if (!ash::Shell::HasInstance())
     return;