Add mash shelf application id support.

content/browser/browser_main_loop.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 "content/browser/browser_main_loop.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
@@ skipping 1153 matching lines @@
       BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::IO)
           ->task_runner()));
 
   if (IsRunningInMojoShell()) {
     if (!MojoShellConnectionImpl::CreateUsingFactory()) {
       mojo::edk::SetParentPipeHandleFromCommandLine();
       MojoShellConnectionImpl::Create();
       MojoShellConnectionImpl::Get()->BindToRequestFromCommandLine();
     }
 #if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA)
-    if (MojoShellConnection::Get()) {
+    MojoShellConnection* mojo_shell_connection = MojoShellConnection::Get();
+    if (mojo_shell_connection) {
       views::WindowManagerConnection::Create(
-          MojoShellConnection::Get()->GetConnector());
+          mojo_shell_connection->GetConnector(),
+          mojo_shell_connection->GetIdentity());
     }
 #endif
   }
 
   mojo_shell_context_.reset(new MojoShellContext);
 #if defined(OS_MACOSX)
   mojo::edk::SetMachPortProvider(MachBroker::GetInstance());
 #endif  // defined(OS_MACOSX)
 
   indexed_db_thread_.reset(new base::Thread("IndexedDB"));
@@ skipping 304 matching lines @@
   audio_task_runner = audio_thread_->task_runner();
   worker_task_runner = audio_thread_->task_runner();
   monitor_task_runner = io_thread_->task_runner();
 #endif  // defined(OS_MACOSX)
   audio_manager_ = media::AudioManager::Create(
       std::move(audio_task_runner), std::move(worker_task_runner),
       std::move(monitor_task_runner), MediaInternals::GetInstance());
 }
 
 }  // namespace content