Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3446)

Unified Diff: chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc

Issue 2578893003: Converts chrome to aura-mus (Closed)
Patch Set: merge 2 trunk Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc
diff --git a/chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc b/chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc
index 02a01a7643b56825c45f459b8dd712e670d205d1..af985d60a1b9a83af9b1dfd1d3b95de5caf6eb34 100644
--- a/chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc
+++ b/chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc
@@ -20,15 +20,13 @@
#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"
@@ -230,24 +228,17 @@ void ImmersiveModeControllerAsh::CreateMashRevealWidget() {
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 =

Powered by Google App Engine
This is Rietveld 408576698