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

Unified Diff: mandoline/ui/desktop_ui/browser_window.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 | « mandoline/ui/desktop_ui/BUILD.gn ('k') | mandoline/ui/desktop_ui/browser_window.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mandoline/ui/desktop_ui/browser_window.h
diff --git a/mandoline/ui/desktop_ui/browser_window.h b/mandoline/ui/desktop_ui/browser_window.h
index 96d7438e8b608b5d21bf5ae6d54eb6dcab20fcad..9361b489f870fdb765ed0a100988366069b26e91 100644
--- a/mandoline/ui/desktop_ui/browser_window.h
+++ b/mandoline/ui/desktop_ui/browser_window.h
@@ -10,13 +10,13 @@
#include "components/mus/public/interfaces/view_tree_host.mojom.h"
#include "components/web_view/public/cpp/web_view.h"
#include "components/web_view/public/interfaces/web_view.mojom.h"
-#include "mandoline/ui/aura/aura_init.h"
#include "mandoline/ui/desktop_ui/find_bar_delegate.h"
#include "mandoline/ui/desktop_ui/public/interfaces/omnibox.mojom.h"
#include "mandoline/ui/desktop_ui/public/interfaces/view_embedder.mojom.h"
#include "mojo/application/public/cpp/interface_factory.h"
#include "mojo/common/weak_binding_set.h"
#include "ui/views/layout/layout_manager.h"
+#include "ui/views/mus/aura_init.h"
#include "url/gurl.h"
namespace mojo {
@@ -97,7 +97,7 @@ class BrowserWindow : public mus::ViewTreeDelegate,
void EmbedOmnibox();
mojo::ApplicationImpl* app_;
- scoped_ptr<AuraInit> aura_init_;
+ scoped_ptr<views::AuraInit> aura_init_;
mojo::ViewTreeHostPtr host_;
mojo::Binding<ViewTreeHostClient> host_client_binding_;
BrowserManager* manager_;
« no previous file with comments | « mandoline/ui/desktop_ui/BUILD.gn ('k') | mandoline/ui/desktop_ui/browser_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698