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

mandoline/ui/omnibox/omnibox_application.cc

 // 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.
 
 #include "mandoline/ui/omnibox/omnibox_application.h"
 
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/mus/public/cpp/view.h"
 #include "components/mus/public/cpp/view_tree_connection.h"
 #include "components/mus/public/cpp/view_tree_delegate.h"
 #include "components/url_formatter/url_fixer.h"
-#include "mandoline/ui/aura/aura_init.h"
-#include "mandoline/ui/aura/native_widget_view_manager.h"
 #include "mandoline/ui/desktop_ui/public/interfaces/view_embedder.mojom.h"
 #include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/layout/layout_manager.h"
+#include "ui/views/mus/aura_init.h"
+#include "ui/views/mus/native_widget_view_manager.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace mandoline {
 
 ////////////////////////////////////////////////////////////////////////////////
 // OmniboxImpl
 
 class OmniboxImpl : public mus::ViewTreeDelegate,
                     public views::LayoutManager,
                     public views::TextfieldController,
@@ skipping 18 matching lines @@
                       const ui::KeyEvent& key_event) override;
 
   // Overridden from Omnibox:
   void GetViewTreeClient(
       mojo::InterfaceRequest<mojo::ViewTreeClient> request) override;
   void ShowForURL(const mojo::String& url) override;
 
   void HideWindow();
   void ShowWindow();
 
-  scoped_ptr<AuraInit> aura_init_;
+  scoped_ptr<views::AuraInit> aura_init_;
   mojo::ApplicationImpl* app_;
   mus::View* root_;
   mojo::String url_;
   views::Textfield* edit_;
   mojo::Binding<Omnibox> binding_;
   ViewEmbedderPtr view_embedder_;
 
   DISALLOW_COPY_AND_ASSIGN(OmniboxImpl);
 };
 
@@ skipping 38 matching lines @@
 }
 OmniboxImpl::~OmniboxImpl() {}
 
 ////////////////////////////////////////////////////////////////////////////////
 // OmniboxImpl, mus::ViewTreeDelegate implementation:
 
 void OmniboxImpl::OnEmbed(mus::View* root) {
   root_ = root;
 
   if (!aura_init_.get()) {
-    aura_init_.reset(new AuraInit(root, app_->shell(), "mandoline_ui.pak"));
+    aura_init_.reset(
+        new views::AuraInit(root, app_->shell(), "mandoline_ui.pak"));
     edit_ = new views::Textfield;
     edit_->set_controller(this);
     edit_->SetTextInputType(ui::TEXT_INPUT_TYPE_URL);
   }
 
   const int kOpacity = 0xC0;
   views::WidgetDelegateView* widget_delegate = new views::WidgetDelegateView;
   widget_delegate->GetContentsView()->set_background(
       views::Background::CreateSolidBackground(
           SkColorSetA(0xDDDDDD, kOpacity)));
   widget_delegate->GetContentsView()->AddChildView(edit_);
   widget_delegate->GetContentsView()->SetLayoutManager(this);
 
   // TODO(beng): we may be leaking these on subsequent calls to OnEmbed()...
   //             probably should only allow once instance per view.
   views::Widget* widget = new views::Widget;
   views::Widget::InitParams params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
   params.native_widget =
-      new NativeWidgetViewManager(widget, app_->shell(), root);
+      new views::NativeWidgetViewManager(widget, app_->shell(), root);
   params.delegate = widget_delegate;
   params.bounds = root->bounds().To<gfx::Rect>();
   params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   widget->Init(params);
   widget->Show();
   widget->GetCompositor()->SetBackgroundColor(
       SkColorSetA(SK_ColorBLACK, kOpacity));
 
   ShowWindow();
 }
@@ skipping 68 matching lines @@
   edit_->SelectAll(false);
   edit_->RequestFocus();
 }
 
 void OmniboxImpl::HideWindow() {
   DCHECK(root_);
   root_->SetVisible(false);
 }
 
 }  // namespace mandoline