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

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

Issue 1340983002: Mandoline UI Process: Update namespaces and file names (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased 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.cc
diff --git a/components/mus/public/cpp/tests/view_manager_test_base.cc b/components/mus/public/cpp/tests/view_manager_test_base.cc
index 8ed4204fdcf3a3ed34430d79171de5e45b84ede7..508cd82a6f77a0ce93fc567ff912bfc3353a8381 100644
--- a/components/mus/public/cpp/tests/view_manager_test_base.cc
+++ b/components/mus/public/cpp/tests/view_manager_test_base.cc
@@ -13,7 +13,7 @@
#include "components/mus/public/cpp/view_tree_host_factory.h"
#include "mojo/application/public/cpp/application_impl.h"
-namespace mojo {
+namespace mus {
namespace {
base::RunLoop* current_run_loop = nullptr;
@@ -73,13 +73,13 @@ void ViewManagerTestBase::TearDown() {
ApplicationTestBase::TearDown();
}
-ApplicationDelegate* ViewManagerTestBase::GetApplicationDelegate() {
+mojo::ApplicationDelegate* ViewManagerTestBase::GetApplicationDelegate() {
return this;
}
bool ViewManagerTestBase::ConfigureIncomingConnection(
- ApplicationConnection* connection) {
- connection->AddService<ViewTreeClient>(this);
+ mojo::ApplicationConnection* connection) {
+ connection->AddService<mojo::ViewTreeClient>(this);
return true;
}
@@ -92,9 +92,10 @@ void ViewManagerTestBase::OnConnectionLost(ViewTreeConnection* connection) {
view_tree_connection_destroyed_ = true;
}
-void ViewManagerTestBase::Create(ApplicationConnection* connection,
- InterfaceRequest<ViewTreeClient> request) {
+void ViewManagerTestBase::Create(
+ mojo::ApplicationConnection* connection,
+ mojo::InterfaceRequest<mojo::ViewTreeClient> request) {
ViewTreeConnection::Create(this, request.Pass());
}
-} // namespace mojo
+} // namespace mus
« no previous file with comments | « components/mus/public/cpp/tests/view_manager_test_base.h ('k') | components/mus/public/cpp/tests/view_manager_test_suite.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698