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

Unified Diff: components/mus/public/cpp/tests/view_manager_test_base.h

Issue 1351013002: Revert of Mandoline UI Process: Update namespaces and file names (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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
Index: components/mus/public/cpp/tests/view_manager_test_base.h
diff --git a/components/mus/public/cpp/tests/view_manager_test_base.h b/components/mus/public/cpp/tests/view_manager_test_base.h
index a1529f33c1191c8312e47e85a0ff9c11ca4e82f1..15a802c9010096229861c4a81915f56f9c273523 100644
--- a/components/mus/public/cpp/tests/view_manager_test_base.h
+++ b/components/mus/public/cpp/tests/view_manager_test_base.h
@@ -13,17 +13,16 @@
#include "mojo/application/public/cpp/application_test_base.h"
#include "mojo/application/public/cpp/interface_factory.h"
-namespace mus {
+namespace mojo {
// ViewManagerTestBase is a base class for use with app tests that use
// ViewManager. SetUp() connects to the ViewManager and blocks until OnEmbed()
// has been invoked. window_manager() can be used to access the ViewManager
// established as part of SetUp().
-class ViewManagerTestBase
- : public mojo::test::ApplicationTestBase,
- public mojo::ApplicationDelegate,
- public ViewTreeDelegate,
- public mojo::InterfaceFactory<mojo::ViewTreeClient> {
+class ViewManagerTestBase : public test::ApplicationTestBase,
+ public ApplicationDelegate,
+ public ViewTreeDelegate,
+ public InterfaceFactory<ViewTreeClient> {
public:
ViewManagerTestBase();
~ViewManagerTestBase() override;
@@ -54,26 +53,25 @@
void TearDown() override;
// test::ApplicationTestBase:
- mojo::ApplicationDelegate* GetApplicationDelegate() override;
+ ApplicationDelegate* GetApplicationDelegate() override;
// ApplicationDelegate:
- bool ConfigureIncomingConnection(
- mojo::ApplicationConnection* connection) override;
+ bool ConfigureIncomingConnection(ApplicationConnection* connection) override;
// ViewTreeDelegate:
void OnEmbed(View* root) override;
void OnConnectionLost(ViewTreeConnection* connection) override;
// InterfaceFactory<ViewTreeClient>:
- void Create(mojo::ApplicationConnection* connection,
- mojo::InterfaceRequest<mojo::ViewTreeClient> request) override;
+ void Create(ApplicationConnection* connection,
+ InterfaceRequest<ViewTreeClient> request) override;
// Used to receive the most recent view tree connection loaded by an embed
// action.
ViewTreeConnection* most_recent_connection_;
private:
- mojo::ViewTreeHostPtr host_;
+ ViewTreeHostPtr host_;
// The View Manager connection held by the window manager (app running at the
// root view).
@@ -84,6 +82,6 @@
MOJO_DISALLOW_COPY_AND_ASSIGN(ViewManagerTestBase);
};
-} // namespace mus
+} // namespace mojo
#endif // COMPONENTS_MUS_PUBLIC_CPP_TESTS_VIEW_MANAGER_TEST_BASE_H_
« no previous file with comments | « components/mus/public/cpp/tests/run_all_unittests.cc ('k') | components/mus/public/cpp/tests/view_manager_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698