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 |