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

Side by Side Diff: mash/wm/window_manager_unittest.cc

Issue 1882423004: Move shell service to toplevel shell namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 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 unified diff | Download patch
« no previous file with comments | « mash/wm/window_manager_application.cc ('k') | media/mojo/services/android_mojo_media_client.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <stdint.h> 5 #include <stdint.h>
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 13 matching lines...) Expand all
24 ~WindowTreeDelegateImpl() override {} 24 ~WindowTreeDelegateImpl() override {}
25 25
26 private: 26 private:
27 // mus::WindowTreeDelegate: 27 // mus::WindowTreeDelegate:
28 void OnEmbed(mus::Window* root) override {} 28 void OnEmbed(mus::Window* root) override {}
29 void OnConnectionLost(mus::WindowTreeConnection* connection) override {} 29 void OnConnectionLost(mus::WindowTreeConnection* connection) override {}
30 30
31 DISALLOW_COPY_AND_ASSIGN(WindowTreeDelegateImpl); 31 DISALLOW_COPY_AND_ASSIGN(WindowTreeDelegateImpl);
32 }; 32 };
33 33
34 class WindowManagerTest : public mojo::test::ShellTest { 34 class WindowManagerTest : public shell::test::ShellTest {
35 public: 35 public:
36 WindowManagerTest() : mojo::test::ShellTest("exe:mash_unittests") {} 36 WindowManagerTest() : shell::test::ShellTest("exe:mash_unittests") {}
37 ~WindowManagerTest() override {} 37 ~WindowManagerTest() override {}
38 38
39 private: 39 private:
40 DISALLOW_COPY_AND_ASSIGN(WindowManagerTest); 40 DISALLOW_COPY_AND_ASSIGN(WindowManagerTest);
41 }; 41 };
42 42
43 void OnEmbed(bool success) { 43 void OnEmbed(bool success) {
44 ASSERT_TRUE(success); 44 ASSERT_TRUE(success);
45 } 45 }
46 46
(...skipping 20 matching lines...) Expand all
67 child_window->Embed(std::move(tree_client), base::Bind(&OnEmbed)); 67 child_window->Embed(std::move(tree_client), base::Bind(&OnEmbed));
68 std::unique_ptr<mus::WindowTreeConnection> child_connection( 68 std::unique_ptr<mus::WindowTreeConnection> child_connection(
69 mus::WindowTreeConnection::Create( 69 mus::WindowTreeConnection::Create(
70 &window_tree_delegate, std::move(tree_client_request), 70 &window_tree_delegate, std::move(tree_client_request),
71 mus::WindowTreeConnection::CreateType::WAIT_FOR_EMBED)); 71 mus::WindowTreeConnection::CreateType::WAIT_FOR_EMBED));
72 ASSERT_TRUE(!child_connection->GetRoots().empty()); 72 ASSERT_TRUE(!child_connection->GetRoots().empty());
73 } 73 }
74 74
75 } // namespace wm 75 } // namespace wm
76 } // namespace mash 76 } // namespace mash
OLDNEW
« no previous file with comments | « mash/wm/window_manager_application.cc ('k') | media/mojo/services/android_mojo_media_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698