summaryrefslogtreecommitdiffstats
path: root/mash/example
diff options
context:
space:
mode:
authorsky <sky@chromium.org>2015-11-25 18:39:58 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-26 02:41:29 +0000
commitef819da4dfaec81f11ed223b5377e2e3bff6692c (patch)
tree11c3537d8c71e75375cdbd28418033128c7eb061 /mash/example
parent2c8b4efcb8bf91a9266ce150ff4e2eeb18821df0 (diff)
downloadchromium_src-ef819da4dfaec81f11ed223b5377e2e3bff6692c.zip
chromium_src-ef819da4dfaec81f11ed223b5377e2e3bff6692c.tar.gz
chromium_src-ef819da4dfaec81f11ed223b5377e2e3bff6692c.tar.bz2
Renames example_wm to mash_wm
Also, fixes wm_apptest and adds to list of tests to run. BUG=none TEST=none R=ben@chromium.org Review URL: https://codereview.chromium.org/1478813002 Cr-Commit-Position: refs/heads/master@{#361801}
Diffstat (limited to 'mash/example')
-rw-r--r--mash/example/main/main_application_delegate.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/mash/example/main/main_application_delegate.cc b/mash/example/main/main_application_delegate.cc
index c1d85ba..3ac499a 100644
--- a/mash/example/main/main_application_delegate.cc
+++ b/mash/example/main/main_application_delegate.cc
@@ -12,7 +12,7 @@ MainApplicationDelegate::MainApplicationDelegate() {}
MainApplicationDelegate::~MainApplicationDelegate() {}
void MainApplicationDelegate::Initialize(mojo::ApplicationImpl* app) {
- connections_.push_back(app->ConnectToApplication("mojo:example_wm"));
+ connections_.push_back(app->ConnectToApplication("mojo:mash_wm"));
connections_.push_back(app->ConnectToApplication("mojo:mock_sysui"));
connections_.push_back(app->ConnectToApplication("mojo:views_examples"));
connections_.push_back(