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

Unified Diff: components/mus/example/common/mus_views_init.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 | « components/mus/example/common/mus_views_init.h ('k') | mandoline/ui/aura/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/mus/example/common/mus_views_init.cc
diff --git a/components/mus/example/common/mus_views_init.cc b/components/mus/example/common/mus_views_init.cc
index e1f4fafc96c5928da88dd849d03bf650457ca22d..968fdfb678ece725fc2124859f74e88680dc3807 100644
--- a/components/mus/example/common/mus_views_init.cc
+++ b/components/mus/example/common/mus_views_init.cc
@@ -7,10 +7,10 @@
#include "components/mus/example/wm/wm.mojom.h"
#include "components/mus/public/cpp/view_tree_connection.h"
#include "components/mus/public/interfaces/view_tree.mojom.h"
-#include "mandoline/ui/aura/aura_init.h"
-#include "mandoline/ui/aura/native_widget_view_manager.h"
#include "mojo/application/public/cpp/application_connection.h"
#include "mojo/application/public/cpp/application_impl.h"
+#include "ui/views/mus/aura_init.h"
+#include "ui/views/mus/native_widget_view_manager.h"
MUSViewsInit::MUSViewsInit(mojo::ApplicationImpl* app) : app_(app) {}
@@ -35,8 +35,8 @@ mus::View* MUSViewsInit::CreateWindow() {
views::NativeWidget* MUSViewsInit::CreateNativeWidget(
views::internal::NativeWidgetDelegate* delegate) {
- return new mandoline::NativeWidgetViewManager(delegate, app_->shell(),
- CreateWindow());
+ return new views::NativeWidgetViewManager(delegate, app_->shell(),
+ CreateWindow());
}
void MUSViewsInit::OnBeforeWidgetInit(
@@ -46,7 +46,7 @@ void MUSViewsInit::OnBeforeWidgetInit(
void MUSViewsInit::OnEmbed(mus::View* root) {
if (!aura_init_) {
aura_init_.reset(
- new mandoline::AuraInit(root, app_->shell(), "example_resources.pak"));
+ new views::AuraInit(root, app_->shell(), "example_resources.pak"));
}
}
« no previous file with comments | « components/mus/example/common/mus_views_init.h ('k') | mandoline/ui/aura/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698