Make the browser->metro_viewer IPC channel name a constant instead of hardcoding it in a few places…

win8/delegate_execute/command_execute_impl.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.
 // Implementation of the CommandExecuteImpl class which implements the
 // IExecuteCommand and related interfaces for handling ShellExecute based
 // launches of the Chrome browser.
 
 #include "win8/delegate_execute/command_execute_impl.h"
 
 #include <shlguid.h>
@@ skipping 41 matching lines @@
   if (hr != S_OK) {
     AtlTrace("Failed to get display name\n");
     return hr;
   }
 
   *url = static_cast<const wchar_t*>(name);
   AtlTrace("Retrieved url from display name %ls\n", url->c_str());
   return S_OK;
 }
 
+#if defined(USE_AURA)
 bool LaunchChromeBrowserProcess() {
   base::FilePath delegate_exe_path;
   if (!PathService::Get(base::FILE_EXE, &delegate_exe_path))
     return false;
 
   // First try and go up a level to find chrome.exe.
   base::FilePath chrome_exe_path =
       delegate_exe_path.DirName()
                        .DirName()
                        .Append(chrome::kBrowserProcessExecutableName);
   if (!file_util::PathExists(chrome_exe_path)) {
     // Try looking in the current directory if we couldn't find it one up in
     // order to support developer installs.
     chrome_exe_path =
         delegate_exe_path.DirName()
                          .Append(chrome::kBrowserProcessExecutableName);
   }
 
   if (!file_util::PathExists(chrome_exe_path)) {
     AtlTrace("Could not locate chrome.exe at: %ls\n",
              chrome_exe_path.value().c_str());
     return false;
   }
 
   CommandLine cl(chrome_exe_path);
 
   // Prevent a Chrome window from showing up on the desktop.
   cl.AppendSwitch(switches::kSilentLaunch);
 
-  // Tell Chrome the IPC channel name to use.
-  // TODO(robertshield): Figure out how to get this name to both the launched
-  // desktop browser process and the resulting activated metro process.
-  cl.AppendSwitchASCII(switches::kViewerConnection, "viewer");
+  // Tell Chrome to connect to the Metro viewer process.
+  cl.AppendSwitch(switches::kViewerConnect);
 
   base::LaunchOptions launch_options;
   launch_options.start_hidden = true;
 
   return base::LaunchProcess(cl, launch_options, NULL);
 }
+#endif  // defined(USE_AURA)
 
 }  // namespace
 
 bool CommandExecuteImpl::path_provider_initialized_ = false;
 
 // CommandExecuteImpl is resposible for activating chrome in Windows 8. The
 // flow is complicated and this tries to highlight the important events.
 // The current approach is to have a single instance of chrome either
 // running in desktop or metro mode. If there is no current instance then
 // the desktop shortcut launches desktop chrome and the metro tile or search
@@ skipping 465 matching lines @@
     AtlTrace("Invalid registry launch mode value %u\n", reg_value);
     launch_mode = ECHUIM_DESKTOP;
   } else {
     launch_mode = static_cast<EC_HOST_UI_MODE>(reg_value);
     AtlTrace("Launch mode forced by registry to %s\n", modes[launch_mode]);
   }
 
   launch_mode_determined = true;
   return launch_mode;
 }