| Index: components/mus/test_change_tracker.cc
|
| diff --git a/components/mus/test_change_tracker.cc b/components/mus/test_change_tracker.cc
|
| index 117c639cd44db63b2258a38fb5801e8496bd00a7..72dd0bc475a42d043c38f57bdb823c1b81245f32 100644
|
| --- a/components/mus/test_change_tracker.cc
|
| +++ b/components/mus/test_change_tracker.cc
|
| @@ -10,15 +10,14 @@
|
| #include "mojo/common/common_type_converters.h"
|
|
|
| using mojo::Array;
|
| -using mojo::Id;
|
| using mojo::ViewDataPtr;
|
| using mojo::String;
|
|
|
| -namespace view_manager {
|
| +namespace mus {
|
|
|
| std::string ViewIdToString(Id id) {
|
| - return (id == 0) ? "null" : base::StringPrintf("%d,%d", mojo::HiWord(id),
|
| - mojo::LoWord(id));
|
| + return (id == 0) ? "null"
|
| + : base::StringPrintf("%d,%d", HiWord(id), LoWord(id));
|
| }
|
|
|
| namespace {
|
| @@ -172,7 +171,7 @@ TestChangeTracker::TestChangeTracker() : delegate_(NULL) {}
|
|
|
| TestChangeTracker::~TestChangeTracker() {}
|
|
|
| -void TestChangeTracker::OnEmbed(mojo::ConnectionSpecificId connection_id,
|
| +void TestChangeTracker::OnEmbed(ConnectionSpecificId connection_id,
|
| ViewDataPtr root) {
|
| Change change;
|
| change.type = CHANGE_TYPE_EMBED;
|
| @@ -289,7 +288,7 @@ void TestChangeTracker::OnViewSharedPropertyChanged(Id view_id,
|
| AddChange(change);
|
| }
|
|
|
| -void TestChangeTracker::OnViewFocused(mojo::Id view_id) {
|
| +void TestChangeTracker::OnViewFocused(Id view_id) {
|
| Change change;
|
| change.type = CHANGE_TYPE_FOCUSED;
|
| change.view_id = view_id;
|
| @@ -326,4 +325,4 @@ std::string TestView::ToString2() const {
|
| drawn ? "true" : "false");
|
| }
|
|
|
| -} // namespace view_manager
|
| +} // namespace mus
|
|
|