diff options
| author | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-11 03:20:38 +0000 |
|---|---|---|
| committer | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-11 03:20:38 +0000 |
| commit | a88d6293f77654d0c22c3f37d228ea5fa33daed8 (patch) | |
| tree | 35b6a1d5953601c5f9f3302f1193c387fc87d7a3 /win8/metro_driver | |
| parent | 35835660ee6ea6bc7c95629804fc7a61321f8a3e (diff) | |
| download | chromium_src-a88d6293f77654d0c22c3f37d228ea5fa33daed8.zip chromium_src-a88d6293f77654d0c22c3f37d228ea5fa33daed8.tar.gz chromium_src-a88d6293f77654d0c22c3f37d228ea5fa33daed8.tar.bz2 | |
Make LaunchViewerAndWaitForConnection() always result in the viewer not trying to launch a browser process back.
scottmg did the necessary plumbing to make this true for ash_unittests (via "test_open"), but it should be true for all users of this path (i.e., currently that's only ash_unittests and browser_tests --ash-browsertests).
This CL also adds the 'metro_viewer_constants' target to avoid having to depend on the 'metro_viewer' target itself in various other targets.
BUG=286205
TEST=No more pipe errors on http://build.chromium.org/p/chromium.fyi/builders/Chromium%20Win%20Aura%20Ash%20(1)
Review URL: https://codereview.chromium.org/98853005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239992 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'win8/metro_driver')
| -rw-r--r-- | win8/metro_driver/chrome_app_view_ash.cc | 5 | ||||
| -rw-r--r-- | win8/metro_driver/metro_driver.gyp | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/win8/metro_driver/chrome_app_view_ash.cc b/win8/metro_driver/chrome_app_view_ash.cc index e6525d1..91eec0a 100644 --- a/win8/metro_driver/chrome_app_view_ash.cc +++ b/win8/metro_driver/chrome_app_view_ash.cc @@ -428,9 +428,8 @@ bool LaunchChromeBrowserProcess(const wchar_t* additional_parameters, mswrw::HString launch_args_str; launch_args->get_Arguments(launch_args_str.GetAddressOf()); string16 actual_launch_args(MakeStdWString(launch_args_str.Get())); - if (actual_launch_args == L"test_open") { - DVLOG(1) << __FUNCTION__ - << "Not launching chrome server"; + if (actual_launch_args == win8::kMetroViewerConnectVerb) { + DVLOG(1) << __FUNCTION__ << "Not launching chrome server"; return true; } } diff --git a/win8/metro_driver/metro_driver.gyp b/win8/metro_driver/metro_driver.gyp index 1b81a79..cc572d8 100644 --- a/win8/metro_driver/metro_driver.gyp +++ b/win8/metro_driver/metro_driver.gyp @@ -75,7 +75,7 @@ 'conditions': [ ['use_aura==1', { 'dependencies': [ - '../win8.gyp:metro_viewer', + '../win8.gyp:metro_viewer_constants', ], 'sources': [ 'chrome_app_view_ash.cc', |