Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(586)

Unified Diff: ui/views/mus/native_widget_view_manager.h

Issue 1402213002: Moves mandoline/ui/aura to ui/views/mus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: disable presubmit Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/mus/input_method_mus.cc ('k') | ui/views/mus/native_widget_view_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_
« no previous file with comments | « ui/views/mus/input_method_mus.cc ('k') | ui/views/mus/native_widget_view_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698