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

Unified Diff: mojo/application/application_runner_chromium.cc

Issue 1841863002: Update monet. (Closed) Base URL: https://github.com/domokit/monet.git@master
Patch Set: Created 4 years, 9 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/application/application_runner_chromium.h ('k') | mojo/application/content_handler_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/application/application_runner_chromium.cc
diff --git a/mojo/application/application_runner_chromium.cc b/mojo/application/application_runner_chromium.cc
index a4e28c19cc487dbc76f53ad9d2d7d4b556d39f31..bfe9d49831ec6d2b4bc3deadfb123563e0948192 100644
--- a/mojo/application/application_runner_chromium.cc
+++ b/mojo/application/application_runner_chromium.cc
@@ -7,11 +7,12 @@
#include "base/at_exit.h"
#include "base/command_line.h"
#include "base/debug/stack_trace.h"
-#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/message_pump/message_pump_mojo.h"
+#include "mojo/public/cpp/application/application_delegate.h"
+#include "mojo/public/cpp/application/application_impl.h"
+#include "mojo/public/cpp/system/handle.h"
+#include "mojo/public/cpp/system/message_pipe.h"
namespace mojo {
@@ -23,13 +24,11 @@ void ApplicationImpl::Terminate() {
ApplicationRunnerChromium::ApplicationRunnerChromium(
ApplicationDelegate* delegate)
- : delegate_(scoped_ptr<ApplicationDelegate>(delegate)),
+ : delegate_(delegate),
message_loop_type_(base::MessageLoop::TYPE_CUSTOM),
- has_run_(false) {
-}
+ has_run_(false) {}
-ApplicationRunnerChromium::~ApplicationRunnerChromium() {
-}
+ApplicationRunnerChromium::~ApplicationRunnerChromium() {}
void ApplicationRunnerChromium::set_message_loop_type(
base::MessageLoop::Type type) {
@@ -52,7 +51,7 @@ MojoResult ApplicationRunnerChromium::Run(
#endif
{
- scoped_ptr<base::MessageLoop> loop;
+ std::unique_ptr<base::MessageLoop> loop;
if (message_loop_type_ == base::MessageLoop::TYPE_CUSTOM)
loop.reset(new base::MessageLoop(common::MessagePumpMojo::Create()));
else
« no previous file with comments | « mojo/application/application_runner_chromium.h ('k') | mojo/application/content_handler_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698