Converts chrome to aura-mus

chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc

 // Copyright 2012 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/immersive_mode_controller_ash.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/shared/immersive_revealed_lock.h"
 #include "ash/shell.h"
 #include "ash/wm/window_state_aura.h"
 #include "base/macros.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/ui/ash/ash_util.h"
 #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h"
 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/top_container_view.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "services/ui/public/cpp/property_type_converters.h"
-#include "services/ui/public/cpp/window_tree_client.h"
 #include "services/ui/public/interfaces/window_manager.mojom.h"
 #include "ui/aura/mus/mus_util.h"
 #include "ui/aura/mus/property_converter.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/paint_context.h"
 #include "ui/compositor/paint_recorder.h"
-#include "ui/views/mus/native_widget_mus.h"
-#include "ui/views/mus/window_manager_connection.h"
+#include "ui/views/mus/mus_client.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/non_client_view.h"
 
 namespace {
 
 // Revealing the TopContainerView looks better if the animation starts and ends
 // just a few pixels before the view goes offscreen, which reduces the visual
 // "pop" as the 3-pixel tall "light bar" style tab strip becomes visible.
 const int kAnimationOffsetY = 3;
@@ skipping 181 matching lines @@
     return true;
   }
   return false;
 }
 
 void ImmersiveModeControllerAsh::CreateMashRevealWidget() {
   if (!chrome::IsRunningInMash())
     return;
 
   DCHECK(!mash_reveal_widget_);
-  mash_reveal_widget_.reset(new views::Widget);
+  mash_reveal_widget_ = base::MakeUnique<views::Widget>();
   views::Widget::InitParams init_params(views::Widget::InitParams::TYPE_POPUP);
-  std::map<std::string, std::vector<uint8_t>> window_properties;
-  window_properties[ui::mojom::WindowManager::kRenderParentTitleArea_Property] =
+  init_params.mus_properties
+      [ui::mojom::WindowManager::kRenderParentTitleArea_Property] =
       mojo::ConvertTo<std::vector<uint8_t>>(
           static_cast<aura::PropertyConverter::PrimitiveType>(true));
-  window_properties[ui::mojom::WindowManager::kName_Property] =
-      mojo::ConvertTo<std::vector<uint8_t>>(
-          std::string("ChromeImmersiveRevealWindow"));
-  init_params.native_widget = new views::NativeWidgetMus(
-      mash_reveal_widget_.get(),
-      views::WindowManagerConnection::Get()->client()->NewWindow(
-          &window_properties),
-      ui::mojom::CompositorFrameSinkType::DEFAULT);
+  init_params.name = "ChromeImmersiveRevealWindow";
   init_params.accept_events = false;
   init_params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   init_params.activatable = views::Widget::InitParams::ACTIVATABLE_NO;
-  init_params.parent_mus = GetMusWindow(native_window_);
+  init_params.parent = native_window_;
   const gfx::Rect& top_container_bounds =
       browser_view_->top_container()->bounds();
   init_params.bounds =
       gfx::Rect(0, -top_container_bounds.height(), top_container_bounds.width(),
                 top_container_bounds.height());
   mash_reveal_widget_->Init(init_params);
   mash_reveal_widget_->SetContentsView(
       new DelegatingPaintView(browser_view_->top_container()));
   mash_reveal_widget_->StackAtTop();
   mash_reveal_widget_->Show();
@@ skipping 98 matching lines @@
   // the shelf completely and prevent it from being revealed.
   bool in_tab_fullscreen = content::Source<FullscreenController>(source)->
       IsWindowFullscreenForTabOrPending();
   ash::wm::GetWindowState(native_window_)
       ->set_hide_shelf_when_fullscreen(in_tab_fullscreen);
   ash::Shell::GetInstance()->UpdateShelfVisibility();
 
   if (tab_indicator_visibility_changed)
     LayoutBrowserRootView();
 }