Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1426)

Unified Diff: mojo/embedder/channel_init.cc

Issue 472903002: Mojo: Get rid of some unneeded namespace qualifiers in mojo/embedder/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/embedder/channel_init.h ('k') | mojo/embedder/embedder_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/embedder/channel_init.cc
diff --git a/mojo/embedder/channel_init.cc b/mojo/embedder/channel_init.cc
index 2da9bcd0cd952e59191a38df82f30c8e998b071b..31cb50090e472e05954f4facb2361be5806db36f 100644
--- a/mojo/embedder/channel_init.cc
+++ b/mojo/embedder/channel_init.cc
@@ -19,20 +19,18 @@ ChannelInit::~ChannelInit() {
DestroyChannel(channel_info_);
}
-mojo::ScopedMessagePipeHandle ChannelInit::Init(
+ScopedMessagePipeHandle ChannelInit::Init(
base::PlatformFile file,
scoped_refptr<base::TaskRunner> io_thread_task_runner) {
DCHECK(!io_thread_task_runner_.get()); // Should only init once.
io_thread_task_runner_ = io_thread_task_runner;
- mojo::ScopedMessagePipeHandle message_pipe =
- mojo::embedder::CreateChannel(
- mojo::embedder::ScopedPlatformHandle(
- mojo::embedder::PlatformHandle(file)),
- io_thread_task_runner,
- base::Bind(&ChannelInit::OnCreatedChannel,
- weak_factory_.GetWeakPtr(),
- io_thread_task_runner),
- base::MessageLoop::current()->message_loop_proxy()).Pass();
+ ScopedMessagePipeHandle message_pipe =
+ CreateChannel(ScopedPlatformHandle(PlatformHandle(file)),
+ io_thread_task_runner,
+ base::Bind(&ChannelInit::OnCreatedChannel,
+ weak_factory_.GetWeakPtr(),
+ io_thread_task_runner),
+ base::MessageLoop::current()->message_loop_proxy()).Pass();
return message_pipe.Pass();
}
@@ -44,7 +42,7 @@ void ChannelInit::WillDestroySoon() {
// static
void ChannelInit::OnCreatedChannel(base::WeakPtr<ChannelInit> self,
scoped_refptr<base::TaskRunner> io_thread,
- embedder::ChannelInfo* channel) {
+ ChannelInfo* channel) {
// If |self| was already destroyed, shut the channel down.
if (!self) {
DestroyChannel(channel);
« no previous file with comments | « mojo/embedder/channel_init.h ('k') | mojo/embedder/embedder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698