Revert of Converts chrome to aura-mus

chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.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 "chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.h"
 
 #include <algorithm>
 
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/layout_constants.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 #include "chrome/browser/ui/views/frame/browser_frame_mus.h"
 #include "chrome/browser/ui/views/frame/browser_header_painter_ash.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
 #include "chrome/browser/ui/views/frame/web_app_left_header_view_ash.h"
 #include "chrome/browser/ui/views/profiles/profile_indicator_icon.h"
 #include "chrome/browser/ui/views/tab_icon_view.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/grit/theme_resources.h"
 #include "content/public/browser/web_contents.h"
+#include "services/ui/public/cpp/window.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/layout.h"
 #include "ui/base/theme_provider.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/scoped_canvas.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/layout_constants.h"
-#include "ui/views/mus/desktop_window_tree_host_mus.h"
 #include "ui/views/mus/window_manager_frame_values.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 #if !defined(OS_CHROMEOS)
 #define FRAME_AVATAR_BUTTON
 #endif
 
 namespace {
 
@@ skipping 277 matching lines @@
   if (!delegate)
     return gfx::ImageSkia();
   return delegate->GetWindowIcon();
 }
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserNonClientFrameViewMus, protected:
 
 // BrowserNonClientFrameView:
 void BrowserNonClientFrameViewMus::UpdateProfileIcons() {
 #if defined(FRAME_AVATAR_BUTTON)
-  if (browser_view()->IsRegularOrGuestSession()) {
+  if (browser_view()->IsRegularOrGuestSession())
     profile_switcher_.Update(AvatarButtonStyle::NATIVE);
-    return;
-  }
+  else
 #endif
-  UpdateProfileIndicatorIcon();
+    UpdateProfileIndicatorIcon();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserNonClientFrameViewMus, private:
 
+ui::Window* BrowserNonClientFrameViewMus::mus_window() {
+  return static_cast<BrowserFrameMus*>(frame()->native_widget())->window();
+}
+
 void BrowserNonClientFrameViewMus::UpdateClientArea() {
   std::vector<gfx::Rect> additional_client_area;
   if (tab_strip_) {
     gfx::Rect tab_strip_bounds(GetBoundsForTabStrip(tab_strip_));
     if (!tab_strip_bounds.IsEmpty() && tab_strip_->max_x()) {
       tab_strip_bounds.set_width(tab_strip_->max_x());
       additional_client_area.push_back(tab_strip_bounds);
     }
   }
-  static_cast<aura::WindowTreeHostMus*>(
-      GetWidget()->GetNativeWindow()->GetHost())
-      ->SetClientArea(views::WindowManagerFrameValues::instance().normal_insets,
-                      additional_client_area);
+  mus_window()->SetClientArea(
+      views::WindowManagerFrameValues::instance().normal_insets,
+      additional_client_area);
 }
 
 void BrowserNonClientFrameViewMus::TabStripMaxXChanged(TabStrip* tab_strip) {
   UpdateClientArea();
 }
 
 void BrowserNonClientFrameViewMus::TabStripDeleted(TabStrip* tab_strip) {
   tab_strip_->RemoveObserver(this);
   tab_strip_ = nullptr;
 }
@@ skipping 136 matching lines @@
 }
 
 void BrowserNonClientFrameViewMus::PaintContentEdge(gfx::Canvas* canvas) {
   DCHECK(!UsePackagedAppHeaderStyle() && !UseWebAppHeaderStyle());
   const int bottom = frame_values().normal_insets.bottom();
   canvas->FillRect(
       gfx::Rect(0, bottom, width(), kClientEdgeThickness),
       GetThemeProvider()->GetColor(
           ThemeProperties::COLOR_TOOLBAR_BOTTOM_SEPARATOR));
 }