Index: ui/views/mus/native_widget_view_manager.h |
diff --git a/mandoline/ui/aura/native_widget_view_manager.h b/ui/views/mus/native_widget_view_manager.h |
similarity index 86% |
rename from mandoline/ui/aura/native_widget_view_manager.h |
rename to ui/views/mus/native_widget_view_manager.h |
index 93b99fd880d0c4453e60c2be0d28fba6156102e9..0c9df020a7f9cedf5a10e423d4231ed17b5c3486 100644 |
--- a/mandoline/ui/aura/native_widget_view_manager.h |
+++ b/ui/views/mus/native_widget_view_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 MANDOLINE_UI_AURA_NATIVE_WIDGET_VIEW_MANAGER_H_ |
-#define MANDOLINE_UI_AURA_NATIVE_WIDGET_VIEW_MANAGER_H_ |
+#ifndef UI_VIEWS_MUS_NATIVE_WIDGET_VIEW_MANAGER_H_ |
+#define UI_VIEWS_MUS_NATIVE_WIDGET_VIEW_MANAGER_H_ |
#include "ui/views/widget/native_widget_aura.h" |
@@ -13,6 +13,14 @@ class DefaultCaptureClient; |
} |
} |
+namespace mojo { |
+class Shell; |
+} |
+ |
+namespace mus { |
+class View; |
+} |
+ |
namespace ui { |
namespace internal { |
class InputMethodDelegate; |
@@ -23,15 +31,7 @@ namespace wm { |
class FocusController; |
} |
-namespace mojo { |
-class Shell; |
-} |
- |
-namespace mus { |
-class View; |
-} |
- |
-namespace mandoline { |
+namespace views { |
namespace { |
class NativeWidgetViewObserver; |
@@ -65,6 +65,6 @@ class NativeWidgetViewManager : public views::NativeWidgetAura { |
DISALLOW_COPY_AND_ASSIGN(NativeWidgetViewManager); |
}; |
-} // namespace mandoline |
+} // namespace views |
-#endif // MANDOLINE_UI_AURA_NATIVE_WIDGET_VIEW_MANAGER_H_ |
+#endif // UI_VIEWS_MUS_NATIVE_WIDGET_VIEW_MANAGER_H_ |