Index: components/mus/display_manager.h |
diff --git a/components/view_manager/display_manager.h b/components/mus/display_manager.h |
similarity index 90% |
rename from components/view_manager/display_manager.h |
rename to components/mus/display_manager.h |
index 1b20e7b6c9359ef024cf22389e7c8dfec8054c5b..3f2dc78296db0e172c420a6acc44fece2bb05f9f 100644 |
--- a/components/view_manager/display_manager.h |
+++ b/components/mus/display_manager.h |
@@ -2,8 +2,8 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef COMPONENTS_VIEW_MANAGER_DISPLAY_MANAGER_H_ |
-#define COMPONENTS_VIEW_MANAGER_DISPLAY_MANAGER_H_ |
+#ifndef COMPONENTS_MUS_DISPLAY_MANAGER_H_ |
+#define COMPONENTS_MUS_DISPLAY_MANAGER_H_ |
#include <map> |
@@ -11,9 +11,9 @@ |
#include "base/memory/scoped_ptr.h" |
#include "base/memory/weak_ptr.h" |
#include "base/timer/timer.h" |
-#include "components/view_manager/display_manager_delegate.h" |
-#include "components/view_manager/public/interfaces/view_tree.mojom.h" |
-#include "components/view_manager/surfaces/top_level_display_client.h" |
+#include "components/mus/display_manager_delegate.h" |
+#include "components/mus/public/interfaces/view_tree.mojom.h" |
+#include "components/mus/surfaces/top_level_display_client.h" |
#include "third_party/mojo/src/mojo/public/cpp/bindings/callback.h" |
#include "ui/gfx/geometry/rect.h" |
#include "ui/platform_window/platform_window_delegate.h" |
@@ -86,9 +86,8 @@ class DisplayManager { |
// DisplayManager implementation that connects to the services necessary to |
// actually display. |
-class DefaultDisplayManager : |
- public DisplayManager, |
- public ui::PlatformWindowDelegate { |
+class DefaultDisplayManager : public DisplayManager, |
+ public ui::PlatformWindowDelegate { |
public: |
DefaultDisplayManager( |
bool is_headless, |
@@ -145,4 +144,4 @@ class DefaultDisplayManager : |
} // namespace view_manager |
-#endif // COMPONENTS_VIEW_MANAGER_DISPLAY_MANAGER_H_ |
+#endif // COMPONENTS_MUS_DISPLAY_MANAGER_H_ |