Makes windowmanager draw non-client area

mandoline/ui/desktop_ui/browser_window.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/desktop_ui/browser_window.h"
 
 #include "base/command_line.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "base/trace_event/trace_event.h"
 #include "components/mus/public/cpp/event_matcher.h"
 #include "components/mus/public/cpp/scoped_window_ptr.h"
 #include "components/mus/public/cpp/window_tree_host_factory.h"
-#include "mandoline/ui/common/util.h"
 #include "mandoline/ui/desktop_ui/browser_commands.h"
 #include "mandoline/ui/desktop_ui/browser_manager.h"
 #include "mandoline/ui/desktop_ui/find_bar_view.h"
 #include "mandoline/ui/desktop_ui/public/interfaces/omnibox.mojom.h"
 #include "mandoline/ui/desktop_ui/toolbar_view.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/services/tracing/public/cpp/switches.h"
 #include "mojo/services/tracing/public/interfaces/tracing.mojom.h"
 #include "ui/gfx/canvas.h"
 #include "ui/mojo/init/ui_init.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/mus/aura_init.h"
+#include "ui/views/mus/display_converter.h"
 #include "ui/views/mus/native_widget_view_manager.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace mandoline {
 
 class ProgressView : public views::View {
  public:
   ProgressView() : progress_(0.f), loading_(false) {}
   ~ProgressView() override {}
 
@@ skipping 345 matching lines @@
   find_bar_view_->Hide();
   web_view_.web_view()->StopFinding();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserWindow, private:
 
 void BrowserWindow::Init(mus::Window* root) {
   DCHECK_GT(root->viewport_metrics().device_pixel_ratio, 0);
   if (!aura_init_) {
-    ui_init_.reset(new ui::mojo::UIInit(GetDisplaysFromWindow(root)));
+    ui_init_.reset(new ui::mojo::UIInit(views::GetDisplaysFromWindow(root)));
     aura_init_.reset(new views::AuraInit(app_, "mandoline_ui.pak"));
   }
 
   root_ = root;
   omnibox_view_ = root_->connection()->NewWindow();
   root_->AddChild(omnibox_view_);
 
   views::WidgetDelegateView* widget_delegate = new views::WidgetDelegateView;
   widget_delegate->GetContentsView()->set_background(
     views::Background::CreateSolidBackground(0xFFDDDDDD));
@@ skipping 24 matching lines @@
   omnibox_view_->Embed(view_tree_client.Pass());
 
   // TODO(beng): This should be handled sufficiently by
   //             OmniboxImpl::ShowWindow() but unfortunately view manager policy
   //             currently prevents the embedded app from changing window z for
   //             its own window.
   omnibox_view_->MoveToFront();
 }
 
 }  // namespace mandoline