Moves mandoline/ui/aura to ui/views/mus

mandoline/ui/desktop_ui/browser_window.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MANDOLINE_UI_DESKTOP_UI_BROWSER_WINDOW_H_
 #define MANDOLINE_UI_DESKTOP_UI_BROWSER_WINDOW_H_
 
 #include "components/mus/public/cpp/view_tree_connection.h"
 #include "components/mus/public/cpp/view_tree_delegate.h"
 #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 {
 class ApplicationConnection;
 class Shell;
 class View;
 }
 
 namespace mandoline {
 
@@ skipping 60 matching lines @@
   void Layout(views::View* host) override;
 
   // Overridden from FindBarDelegate:
   void OnDoFind(const std::string& find) override;
   void OnHideFindBar() override;
 
   void Init(mus::View* root);
   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_;
   ToolbarView* toolbar_view_;
   ProgressView* progress_bar_;
   FindBarView* find_bar_view_;
   mus::View* root_;
   mus::View* content_;
   mus::View* omnibox_view_;
 
@@ skipping 12 matching lines @@
 
   OmniboxPtr omnibox_;
   scoped_ptr<mojo::ApplicationConnection> omnibox_connection_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserWindow);
 };
 
 }  // namespace mandoline
 
 #endif  // MANDOLINE_UI_DESKTOP_UI_BROWSER_WINDOW_H_