From 8c2f290e2e178336ab89a01d94ebba774152a6f5 Mon Sep 17 00:00:00 2001 From: "gab@chromium.org" Date: Fri, 21 Jun 2013 07:49:58 +0000 Subject: Make the browser<-->metro_viewer IPC channel name a constant instead of hardcoding it in a few places and passing it via a flag. Supporting a more generic use case via flags was making things more complicated for no apparent reason (other than perhaps one day supporting a random-channel-id -- I removed that TODO in this CL). This simplification will make it easier to introduce some sort of --viewer-launch-via-appid-and-connect flag for https://codereview.chromium.org/16022003/ BUG=179830 TEST=Can still launch Ash in Metro. Review URL: https://chromiumcodereview.appspot.com/15731003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207750 0039d316-1c4b-4281-b951-d872f2087c98 --- win8/delegate_execute/command_execute_impl.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'win8/delegate_execute/command_execute_impl.cc') diff --git a/win8/delegate_execute/command_execute_impl.cc b/win8/delegate_execute/command_execute_impl.cc index 3d56344..03fb4da 100644 --- a/win8/delegate_execute/command_execute_impl.cc +++ b/win8/delegate_execute/command_execute_impl.cc @@ -59,6 +59,7 @@ HRESULT GetUrlFromShellItem(IShellItem* shell_item, string16* url) { return S_OK; } +#if defined(USE_AURA) bool LaunchChromeBrowserProcess() { base::FilePath delegate_exe_path; if (!PathService::Get(base::FILE_EXE, &delegate_exe_path)) @@ -88,16 +89,15 @@ bool LaunchChromeBrowserProcess() { // 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 -- cgit v1.1