summaryrefslogtreecommitdiffstats
path: root/apps/app_shim
diff options
context:
space:
mode:
authorlambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-02 20:29:30 +0000
committerlambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-02 20:29:30 +0000
commit3b0e466e530c99fe730a9a5e11dd416c48e052f8 (patch)
treed4f4d955edc7076fa3408c6625174179da5df72f /apps/app_shim
parentd53b6850a51ebedb7496036ae31e5f2dd142efff (diff)
downloadchromium_src-3b0e466e530c99fe730a9a5e11dd416c48e052f8.zip
chromium_src-3b0e466e530c99fe730a9a5e11dd416c48e052f8.tar.gz
chromium_src-3b0e466e530c99fe730a9a5e11dd416c48e052f8.tar.bz2
Revert 274310 "Introduce IPC::ChannelProxy::Create*() and IPC::S..."
Broke Windows compile: http://build.chromium.org/p/chromium.win/buildstatus?builder=Win%20x64%20Builder&number=180 FAILED: ninja -t msvc -e environment.x64 -- C:\b\build\goma/gomacc "C:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64\cl.exe" /nologo /showIncludes /FC @obj\remoting\host\win\remoting_core.wts_session_process_delegate.obj.rsp /c ..\..\remoting\host\win\wts_session_process_delegate.cc /Foobj\remoting\host\win\remoting_core.wts_session_process_delegate.obj /Fdobj\remoting\remoting_core.cc.pdb c:\b\build\slave\win_x64_builder\build\src\remoting\host\win\wts_session_process_delegate.cc(386) : error C2661: 'IPC::ChannelProxy::ChannelProxy' : no overloaded function takes 4 arguments ninja: build stopped: subcommand failed. > Introduce IPC::ChannelProxy::Create*() and IPC::SynChannel::Create*() > > This change hides constructors of these classes so that we can turn > them polymorphic classes. > > Note that having almost identical ChannelProxy::Init*() isn't great > and they will be replaced by a factory-like abstraction in coming > changes. > > TEST=none > R=darin,cpu > BUG=377980 > > Review URL: https://codereview.chromium.org/301973003 TBR=morrita@chromium.org Review URL: https://codereview.chromium.org/312553004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274315 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps/app_shim')
-rw-r--r--apps/app_shim/app_shim_host_mac.cc5
-rw-r--r--apps/app_shim/app_shim_host_manager_browsertest_mac.mm4
-rw-r--r--apps/app_shim/chrome_main_app_mode_mac.mm7
3 files changed, 10 insertions, 6 deletions
diff --git a/apps/app_shim/app_shim_host_mac.cc b/apps/app_shim/app_shim_host_mac.cc
index 57316e5..437fb6b 100644
--- a/apps/app_shim/app_shim_host_mac.cc
+++ b/apps/app_shim/app_shim_host_mac.cc
@@ -24,11 +24,12 @@ AppShimHost::~AppShimHost() {
void AppShimHost::ServeChannel(const IPC::ChannelHandle& handle) {
DCHECK(CalledOnValidThread());
DCHECK(!channel_.get());
- channel_ = IPC::ChannelProxy::CreateServer(
+ channel_.reset(new IPC::ChannelProxy(
handle,
+ IPC::Channel::MODE_SERVER,
this,
content::BrowserThread::GetMessageLoopProxyForThread(
- content::BrowserThread::IO).get());
+ content::BrowserThread::IO).get()));
}
base::FilePath AppShimHost::GetProfilePath() const {
diff --git a/apps/app_shim/app_shim_host_manager_browsertest_mac.mm b/apps/app_shim/app_shim_host_manager_browsertest_mac.mm
index 4327e97..c97f544 100644
--- a/apps/app_shim/app_shim_host_manager_browsertest_mac.mm
+++ b/apps/app_shim/app_shim_host_manager_browsertest_mac.mm
@@ -63,8 +63,8 @@ TestShimClient::TestShimClient() : io_thread_("TestShimClientIO") {
app_mode::VerifySocketPermissions(socket_path);
IPC::ChannelHandle handle(socket_path.value());
- channel_ = IPC::ChannelProxy::CreateNamedClient(
- handle, this, io_thread_.message_loop_proxy().get());
+ channel_.reset(new IPC::ChannelProxy(handle, IPC::Channel::MODE_NAMED_CLIENT,
+ this, io_thread_.message_loop_proxy().get()));
}
TestShimClient::~TestShimClient() {}
diff --git a/apps/app_shim/chrome_main_app_mode_mac.mm b/apps/app_shim/chrome_main_app_mode_mac.mm
index ecc18bf..c04b9a4 100644
--- a/apps/app_shim/chrome_main_app_mode_mac.mm
+++ b/apps/app_shim/chrome_main_app_mode_mac.mm
@@ -214,8 +214,11 @@ void AppShimController::Init() {
void AppShimController::CreateChannelAndSendLaunchApp(
const base::FilePath& socket_path) {
IPC::ChannelHandle handle(socket_path.value());
- channel_ = IPC::ChannelProxy::CreateNamedClient(
- handle, this, g_io_thread->message_loop_proxy().get());
+ channel_.reset(
+ new IPC::ChannelProxy(handle,
+ IPC::Channel::MODE_NAMED_CLIENT,
+ this,
+ g_io_thread->message_loop_proxy().get()));
bool launched_by_chrome =
CommandLine::ForCurrentProcess()->HasSwitch(