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

Unified Diff: mojo/services/kiosk_wm/kiosk_wm.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/services/kiosk_wm/BUILD.gn ('k') | mojo/services/network/udp_socket_apptest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/services/kiosk_wm/kiosk_wm.cc
diff --git a/mojo/services/kiosk_wm/kiosk_wm.cc b/mojo/services/kiosk_wm/kiosk_wm.cc
index 444003a73cf3e88628834068c43892e09d438baf..5c03ade042b0fc5948cf2ab9be01c59dc174d2ae 100644
--- a/mojo/services/kiosk_wm/kiosk_wm.cc
+++ b/mojo/services/kiosk_wm/kiosk_wm.cc
@@ -4,6 +4,8 @@
#include "mojo/services/kiosk_wm/kiosk_wm.h"
+#include "base/command_line.h"
+#include "base/strings/utf_string_conversions.h"
#include "mojo/services/kiosk_wm/merged_service_provider.h"
#include "mojo/services/window_manager/basic_focus_rules.h"
@@ -28,9 +30,17 @@ base::WeakPtr<KioskWM> KioskWM::GetWeakPtr() {
void KioskWM::Initialize(mojo::ApplicationImpl* app) {
window_manager_app_->Initialize(app);
- // Format: --args-for="app_url default_url"
- if (app->args().size() > 1)
- default_url_ = app->args()[1];
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+ base::CommandLine::StringVector args = command_line->GetArgs();
+ if (args.empty()) {
+ default_url_ = "http://www.google.com/";
+ } else {
+#if defined(OS_WIN)
+ default_url_ = base::WideToUTF8(args[0]);
+#else
+ default_url_ = args[0];
+#endif
+ }
}
bool KioskWM::ConfigureIncomingConnection(
« no previous file with comments | « mojo/services/kiosk_wm/BUILD.gn ('k') | mojo/services/network/udp_socket_apptest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698