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

Unified Diff: components/mus/example/common/mus_views_init.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 | « components/mus/example/common/BUILD.gn ('k') | components/mus/example/common/mus_views_init.cc » ('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.h
diff --git a/components/mus/example/common/mus_views_init.h b/components/mus/example/common/mus_views_init.h
index 710020fe66710a39be0bdf0ccb3e6769494bb163..355b25a85497bf9e922d1e6b91a439eebfb5055a 100644
--- a/components/mus/example/common/mus_views_init.h
+++ b/components/mus/example/common/mus_views_init.h
@@ -9,14 +9,14 @@
#include "components/mus/public/cpp/view_tree_delegate.h"
#include "ui/views/views_delegate.h"
-namespace mandoline {
-class AuraInit;
-}
-
namespace mojo {
class ApplicationImpl;
}
+namespace views {
+class AuraInit;
+}
+
// Does the necessary setup to use mus, views and the example wm.
class MUSViewsInit : public views::ViewsDelegate, public mus::ViewTreeDelegate {
public:
@@ -42,7 +42,7 @@ class MUSViewsInit : public views::ViewsDelegate, public mus::ViewTreeDelegate {
mojo::ApplicationImpl* app_;
- scoped_ptr<mandoline::AuraInit> aura_init_;
+ scoped_ptr<views::AuraInit> aura_init_;
DISALLOW_COPY_AND_ASSIGN(MUSViewsInit);
};
« no previous file with comments | « components/mus/example/common/BUILD.gn ('k') | components/mus/example/common/mus_views_init.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698