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

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

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/native_widget_view_manager.h ('k') | ui/views/mus/surface_binding.h » ('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.cc
diff --git a/mandoline/ui/aura/native_widget_view_manager.cc b/ui/views/mus/native_widget_view_manager.cc
similarity index 95%
rename from mandoline/ui/aura/native_widget_view_manager.cc
rename to ui/views/mus/native_widget_view_manager.cc
index 003aca96e139794b72cbe56540b5a27c41166f7b..43bdb2d43e8182445c7b20f49df16934e8e879f3 100644
--- a/mandoline/ui/aura/native_widget_view_manager.cc
+++ b/ui/views/mus/native_widget_view_manager.cc
@@ -2,22 +2,22 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "mandoline/ui/aura/native_widget_view_manager.h"
+#include "ui/views/mus/native_widget_view_manager.h"
#include "components/mus/public/cpp/view.h"
-#include "mandoline/ui/aura/input_method_mandoline.h"
-#include "mandoline/ui/aura/window_tree_host_mojo.h"
#include "mojo/converters/geometry/geometry_type_converters.h"
#include "mojo/converters/input_events/input_events_type_converters.h"
#include "ui/aura/client/default_capture_client.h"
#include "ui/aura/window.h"
#include "ui/aura/window_event_dispatcher.h"
#include "ui/base/ime/input_method_delegate.h"
+#include "ui/views/mus/input_method_mus.h"
+#include "ui/views/mus/window_tree_host_mus.h"
#include "ui/wm/core/base_focus_rules.h"
#include "ui/wm/core/capture_controller.h"
#include "ui/wm/core/focus_controller.h"
-namespace mandoline {
+namespace views {
namespace {
// TODO: figure out what this should be.
@@ -130,4 +130,4 @@ void NativeWidgetViewManager::OnWindowVisibilityChanged(aura::Window* window,
// I'm not bothering.
}
-} // namespace mandoline
+} // namespace views
« no previous file with comments | « ui/views/mus/native_widget_view_manager.h ('k') | ui/views/mus/surface_binding.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698