| Index: mojo/services/view_manager/public/cpp/view_tracker.h
|
| diff --git a/mojo/services/view_manager/public/cpp/view_tracker.h b/mojo/services/view_manager/public/cpp/view_tracker.h
|
| index 05325b7705e0cfd66b39e7b8793c3f448586687d..1d6bf14de03e042affd898c7d356a442e6ca1e94 100644
|
| --- a/mojo/services/view_manager/public/cpp/view_tracker.h
|
| +++ b/mojo/services/view_manager/public/cpp/view_tracker.h
|
| @@ -5,10 +5,10 @@
|
| #ifndef MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_TRACKER_H_
|
| #define MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_TRACKER_H_
|
|
|
| +#include <stdint.h>
|
| #include <set>
|
|
|
| -#include "base/basictypes.h"
|
| -#include "base/compiler_specific.h"
|
| +#include "mojo/public/cpp/system/macros.h"
|
| #include "view_manager/public/cpp/view_observer.h"
|
|
|
| namespace mojo {
|
| @@ -39,7 +39,7 @@ class ViewTracker : public ViewObserver {
|
| private:
|
| Views views_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(ViewTracker);
|
| + MOJO_DISALLOW_COPY_AND_ASSIGN(ViewTracker);
|
| };
|
|
|
| } // namespace mojo
|
|
|