diff options
| author | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-21 07:49:58 +0000 |
|---|---|---|
| committer | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-21 07:49:58 +0000 |
| commit | 8c2f290e2e178336ab89a01d94ebba774152a6f5 (patch) | |
| tree | 802bf45a7853f72013d55fb1578d099240c4132b /win8/metro_driver | |
| parent | ae30caa256bbcf0b80af9f41d803320874c2ac0f (diff) | |
| download | chromium_src-8c2f290e2e178336ab89a01d94ebba774152a6f5.zip chromium_src-8c2f290e2e178336ab89a01d94ebba774152a6f5.tar.gz chromium_src-8c2f290e2e178336ab89a01d94ebba774152a6f5.tar.bz2 | |
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
Diffstat (limited to 'win8/metro_driver')
| -rw-r--r-- | win8/metro_driver/chrome_app_view_ash.cc | 12 | ||||
| -rw-r--r-- | win8/metro_driver/metro_driver.gyp | 3 |
2 files changed, 6 insertions, 9 deletions
diff --git a/win8/metro_driver/chrome_app_view_ash.cc b/win8/metro_driver/chrome_app_view_ash.cc index 530d62c..87ac885 100644 --- a/win8/metro_driver/chrome_app_view_ash.cc +++ b/win8/metro_driver/chrome_app_view_ash.cc @@ -26,6 +26,7 @@ #include "win8/metro_driver/file_picker_ash.h" #include "win8/metro_driver/metro_driver.h" #include "win8/metro_driver/winrt_utils.h" +#include "win8/viewer/metro_viewer_constants.h" typedef winfoundtn::ITypedEventHandler< winapp::Core::CoreApplicationView*, @@ -432,20 +433,13 @@ ChromeAppViewAsh::Run() { options.message_loop_type = base::MessageLoop::TYPE_IO; io_thread.StartWithOptions(options); - std::string ipc_channel_name("viewer"); - - // TODO(robertshield): Figure out how to receive and append the channel ID - // from the delegate_execute instance that launched the browser process. - // See http://crbug.com/162474 - // ipc_channel_name.append(IPC::Channel::GenerateUniqueRandomChannelID()); - // Start up Chrome and wait for the desired IPC server connection to exist. - WaitForChromeIPCConnection(ipc_channel_name); + WaitForChromeIPCConnection(win8::kMetroViewerIPCChannelName); // In Aura mode we create an IPC channel to the browser, then ask it to // connect to us. ChromeChannelListener ui_channel_listener(&ui_loop_, this); - IPC::ChannelProxy ui_channel(ipc_channel_name, + IPC::ChannelProxy ui_channel(win8::kMetroViewerIPCChannelName, IPC::Channel::MODE_NAMED_CLIENT, &ui_channel_listener, io_thread.message_loop_proxy()); diff --git a/win8/metro_driver/metro_driver.gyp b/win8/metro_driver/metro_driver.gyp index bad7c79..483d7d9 100644 --- a/win8/metro_driver/metro_driver.gyp +++ b/win8/metro_driver/metro_driver.gyp @@ -72,6 +72,9 @@ ], 'conditions': [ ['use_aura==1', { + 'dependencies': [ + '../win8.gyp:metro_viewer', + ], 'sources': [ 'chrome_app_view_ash.cc', 'chrome_app_view_ash.h', |