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

Unified Diff: components/mus/test_change_tracker.cc

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
« no previous file with comments | « components/mus/test_change_tracker.h ('k') | components/mus/test_server_view_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/mus/test_change_tracker.cc
diff --git a/components/mus/test_change_tracker.cc b/components/mus/test_change_tracker.cc
index 72dd0bc475a42d043c38f57bdb823c1b81245f32..117c639cd44db63b2258a38fb5801e8496bd00a7 100644
--- a/components/mus/test_change_tracker.cc
+++ b/components/mus/test_change_tracker.cc
@@ -10,14 +10,15 @@
#include "mojo/common/common_type_converters.h"
using mojo::Array;
+using mojo::Id;
using mojo::ViewDataPtr;
using mojo::String;
-namespace mus {
+namespace view_manager {
std::string ViewIdToString(Id id) {
- return (id == 0) ? "null"
- : base::StringPrintf("%d,%d", HiWord(id), LoWord(id));
+ return (id == 0) ? "null" : base::StringPrintf("%d,%d", mojo::HiWord(id),
+ mojo::LoWord(id));
}
namespace {
@@ -171,7 +172,7 @@
TestChangeTracker::~TestChangeTracker() {}
-void TestChangeTracker::OnEmbed(ConnectionSpecificId connection_id,
+void TestChangeTracker::OnEmbed(mojo::ConnectionSpecificId connection_id,
ViewDataPtr root) {
Change change;
change.type = CHANGE_TYPE_EMBED;
@@ -288,7 +289,7 @@
AddChange(change);
}
-void TestChangeTracker::OnViewFocused(Id view_id) {
+void TestChangeTracker::OnViewFocused(mojo::Id view_id) {
Change change;
change.type = CHANGE_TYPE_FOCUSED;
change.view_id = view_id;
@@ -325,4 +326,4 @@
drawn ? "true" : "false");
}
-} // namespace mus
+} // namespace view_manager
« no previous file with comments | « components/mus/test_change_tracker.h ('k') | components/mus/test_server_view_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698