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

Unified Diff: mojo/shell/android/main.cc

Issue 1057603003: Simplify mojo_shell since it's now only used for Mandoline. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update scripts Created 5 years, 8 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/shell/BUILD.gn ('k') | mojo/shell/application_manager/application_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/shell/android/main.cc
diff --git a/mojo/shell/android/main.cc b/mojo/shell/android/main.cc
index 41c507aaff24ae7aef01aac8f3f7080d9c340078..9caf84025ac6fdd6b7ba40b9509604f0a8904a20 100644
--- a/mojo/shell/android/main.cc
+++ b/mojo/shell/android/main.cc
@@ -26,7 +26,6 @@
#include "mojo/shell/android/native_viewport_application_loader.h"
#include "mojo/shell/android/ui_application_loader_android.h"
#include "mojo/shell/application_manager/application_loader.h"
-#include "mojo/shell/command_line_util.h"
#include "mojo/shell/context.h"
#include "mojo/shell/init.h"
#include "ui/gl/gl_surface_egl.h"
@@ -46,15 +45,12 @@ const char kFifoPath[] = "fifo-path";
class MojoShellRunner : public base::DelegateSimpleThread::Delegate {
public:
- MojoShellRunner(const std::vector<std::string>& parameters)
- : parameters_(parameters) {}
+ MojoShellRunner(const std::vector<std::string>& parameters) {}
~MojoShellRunner() override {}
private:
void Run() override;
- std::vector<std::string> parameters_;
-
DISALLOW_COPY_AND_ASSIGN(MojoShellRunner);
};
@@ -107,10 +103,7 @@ void MojoShellRunner::Run() {
ConfigureAndroidServices(context);
context->Init();
- for (auto& args : parameters_)
- ApplyApplicationArgs(context, args);
-
- RunCommandLineApps(context);
+ context->Run(GURL("mojo:window_manager"));
loop.Run();
g_java_message_loop.Pointer()->get()->PostTask(FROM_HERE,
« no previous file with comments | « mojo/shell/BUILD.gn ('k') | mojo/shell/application_manager/application_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698