Makes windowmanager draw non-client area

The high level bits are the following:
. Client area is now expressed as insets. This avoids resetting the
  client area any time the bounds changes.
. WindowManager now exposes preferred insets.
. Client side creates a NonClientFrameView that reflects insets
  exposed from WM.
. WM's NonClientFrameView (which draws underneat the client's surface)
  draws the frame decorations. It fills in the client area as black.

BUG=548420
TEST=none
R=ben@chromium.org

Review URL: https://codereview.chromium.org/1419793006

Cr-Commit-Position: refs/heads/master@{#357995}

7 files changed, 4 insertions, 68 deletions

diff --git a/mandoline/ui/common/BUILD.gn b/mandoline/ui/common/BUILD.gn
deleted file mode 100644
index a695e43..0000000
--- a/mandoline/ui/common/BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2014 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.
-
-source_set("common") {
-  sources = [
-    "util.cc",
-    "util.h",
-  ]
-
-  deps = [
-    "//components/mus/public/cpp",
-    "//mojo/converters/geometry",
-    "//ui/gfx",
-    "//ui/gfx/geometry",
-  ]
-}
diff --git a/mandoline/ui/common/util.cc b/mandoline/ui/common/util.cc
deleted file mode 100644
index 2ef1604..0000000
--- a/mandoline/ui/common/util.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-// 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/common/util.h"
-
-#include "components/mus/public/cpp/window.h"
-#include "mojo/converters/geometry/geometry_type_converters.h"
-
-namespace mandoline {
-
-std::vector<gfx::Display> GetDisplaysFromWindow(mus::Window* window) {
-  static int64 synthesized_display_id = 2000;
-  gfx::Display display;
-  display.set_id(synthesized_display_id++);
-  display.SetScaleAndBounds(
-      window->viewport_metrics().device_pixel_ratio,
-      gfx::Rect(window->viewport_metrics().size_in_pixels.To<gfx::Size>()));
-  std::vector<gfx::Display> displays;
-  displays.push_back(display);
-  return displays;
-}
-
-}  // namespace mandoline
diff --git a/mandoline/ui/common/util.h b/mandoline/ui/common/util.h
deleted file mode 100644
index 63e88b5..0000000
--- a/mandoline/ui/common/util.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// 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_COMMON_UTIL_H_
-#define MANDOLINE_UI_COMMON_UTIL_H_
-
-#include <vector>
-#include "ui/gfx/display.h"
-
-namespace mus {
-class Window;
-}
-
-namespace mandoline {
-
-std::vector<gfx::Display> GetDisplaysFromWindow(mus::Window* window);
-
-}  // namespace mandoline
-
-#endif  // MANDOLINE_UI_COMMON_UTIL_H_
\ No newline at end of file
diff --git a/mandoline/ui/desktop_ui/BUILD.gn b/mandoline/ui/desktop_ui/BUILD.gn
index 916683a..255419a 100644
--- a/mandoline/ui/desktop_ui/BUILD.gn
+++ b/mandoline/ui/desktop_ui/BUILD.gn
@@ -39,7 +39,6 @@ source_set("lib") {
     "//base",
     "//components/web_view/public/cpp",
     "//components/web_view/public/interfaces",
-    "//mandoline/ui/common",
     "//mojo/application/public/cpp:sources",
     "//mojo/common:common_base",
     "//mojo/converters/geometry",
diff --git a/mandoline/ui/desktop_ui/browser_window.cc b/mandoline/ui/desktop_ui/browser_window.cc
index 59d82ef..4b4e698 100644
--- a/mandoline/ui/desktop_ui/browser_window.cc
+++ b/mandoline/ui/desktop_ui/browser_window.cc
@@ -12,7 +12,6 @@
 #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"
@@ -27,6 +26,7 @@
 #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"
 
@@ -392,7 +392,7 @@ void BrowserWindow::OnHideFindBar() {
 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"));
   }
 
diff --git a/mandoline/ui/omnibox/BUILD.gn b/mandoline/ui/omnibox/BUILD.gn
index 9e95dbd..76530b9 100644
--- a/mandoline/ui/omnibox/BUILD.gn
+++ b/mandoline/ui/omnibox/BUILD.gn
@@ -28,7 +28,6 @@ source_set("lib") {
     "//base",
     "//components/mus/public/cpp",
     "//components/url_formatter",
-    "//mandoline/ui/common",
     "//mandoline/ui/desktop_ui/public/interfaces",
     "//mojo/application/public/cpp:sources",
     "//mojo/common",
diff --git a/mandoline/ui/omnibox/omnibox_application.cc b/mandoline/ui/omnibox/omnibox_application.cc
index 7dffe08..3a17170 100644
--- a/mandoline/ui/omnibox/omnibox_application.cc
+++ b/mandoline/ui/omnibox/omnibox_application.cc
@@ -10,7 +10,6 @@
 #include "components/mus/public/cpp/window_tree_connection.h"
 #include "components/mus/public/cpp/window_tree_delegate.h"
 #include "components/url_formatter/url_fixer.h"
-#include "mandoline/ui/common/util.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"
@@ -20,6 +19,7 @@
 #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/display_converter.h"
 #include "ui/views/mus/native_widget_view_manager.h"
 #include "ui/views/widget/widget_delegate.h"
 
@@ -119,7 +119,7 @@ void OmniboxImpl::OnEmbed(mus::Window* root) {
   root_ = root;
 
   if (!aura_init_.get()) {
-    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"));
     edit_ = new views::Textfield;
     edit_->set_controller(this);