diff options
| author | jam <jam@chromium.org> | 2015-04-13 18:12:52 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-14 01:13:36 +0000 |
| commit | 541ee5bc890db30033673826d3ed5c19ecd9d339 (patch) | |
| tree | cd5386e5e0aede8259e72e900b49fc93b047ee01 /mojo/services/window_manager/window_manager_apptest.cc | |
| parent | cae887a2935a141f3baebc7ab2106a24015e21e3 (diff) | |
| download | chromium_src-541ee5bc890db30033673826d3ed5c19ecd9d339.zip chromium_src-541ee5bc890db30033673826d3ed5c19ecd9d339.tar.gz chromium_src-541ee5bc890db30033673826d3ed5c19ecd9d339.tar.bz2 | |
Simplify chromium's mojo_shell since it's now only used for Mandoline.
-no need to map kiosk_wm to window_manager, instead, make kiosk_wm's binary output be window_manager.mojom
-no need for app-specific args, instead use base::CommandLine. This is important for Mandoline since we'll be sharing code with Chrome which does use these flags.
-mojo_shell url is enough to start a browser now
-if an argument that starts with mojo: scheme is given (i.e. for an apptest), we load it. otherwise we run mojo:window_manager
Committed: https://crrev.com/143eb32f63bd929f7d730970e2477804f318a7eb
Cr-Commit-Position: refs/heads/master@{#324579}
Review URL: https://codereview.chromium.org/1057603003
Cr-Commit-Position: refs/heads/master@{#324974}
Diffstat (limited to 'mojo/services/window_manager/window_manager_apptest.cc')
| -rw-r--r-- | mojo/services/window_manager/window_manager_apptest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mojo/services/window_manager/window_manager_apptest.cc b/mojo/services/window_manager/window_manager_apptest.cc index 7f82211..390c037 100644 --- a/mojo/services/window_manager/window_manager_apptest.cc +++ b/mojo/services/window_manager/window_manager_apptest.cc @@ -4,9 +4,9 @@ #include "base/bind.h" #include "base/run_loop.h" +#include "mojo/application/application_test_base_chromium.h" #include "mojo/public/cpp/application/application_delegate.h" #include "mojo/public/cpp/application/application_impl.h" -#include "mojo/public/cpp/application/application_test_base.h" #include "mojo/public/cpp/application/service_provider_impl.h" #include "mojo/public/cpp/system/macros.h" #include "third_party/mojo_services/src/view_manager/public/cpp/view.h" @@ -84,7 +84,7 @@ class WindowManagerApplicationTest : public test::ApplicationTestBase { // ApplicationTestBase: void SetUp() override { ApplicationTestBase::SetUp(); - application_impl()->ConnectToService("mojo:window_manager", + application_impl()->ConnectToService("mojo:test_window_manager", &window_manager_); } ApplicationDelegate* GetApplicationDelegate() override { |