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

Unified Diff: mojo/application/application_runner_chromium.cc

Issue 883843002: Update mojo sdk to rev 126532ce21c5c3c55a1e1693731411cb60169efd (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Response to review Created 5 years, 11 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
Index: mojo/application/application_runner_chromium.cc
diff --git a/mojo/application/application_runner_chromium.cc b/mojo/application/application_runner_chromium.cc
index ed6d013a2693f55ab55e24996babc17ea9732b21..069ff90e346b73affdf6a940c690ce63cb747a9e 100644
--- a/mojo/application/application_runner_chromium.cc
+++ b/mojo/application/application_runner_chromium.cc
@@ -10,8 +10,8 @@
#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
#include "mojo/common/message_pump_mojo.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h"
+#include "mojo/public/cpp/application/application_delegate.h"
+#include "mojo/public/cpp/application/application_impl.h"
namespace mojo {
@@ -37,14 +37,13 @@ void ApplicationRunnerChromium::set_message_loop_type(
message_loop_type_ = type;
}
-MojoResult ApplicationRunnerChromium::Run(MojoHandle shell_handle) {
+MojoResult ApplicationRunnerChromium::Run(
+ MojoHandle application_request_handle) {
DCHECK(!has_run_);
has_run_ = true;
base::CommandLine::Init(0, NULL);
-#if !defined(COMPONENT_BUILD)
base::AtExitManager at_exit;
-#endif
#ifndef NDEBUG
base::debug::EnableInProcessStackDumping();
@@ -58,7 +57,8 @@ MojoResult ApplicationRunnerChromium::Run(MojoHandle shell_handle) {
loop.reset(new base::MessageLoop(message_loop_type_));
ApplicationImpl impl(delegate_.get(),
- MakeScopedHandle(MessagePipeHandle(shell_handle)));
+ MakeRequest<Application>(MakeScopedHandle(
+ MessagePipeHandle(application_request_handle))));
loop->Run();
}
delegate_.reset();

Powered by Google App Engine
This is Rietveld 408576698