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

Unified Diff: mash/example/window_type_launcher/window_type_launcher.cc

Issue 2539363005: Converts ash to use aura-mus (Closed)
Patch Set: merge 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: mash/example/window_type_launcher/window_type_launcher.cc
diff --git a/mash/example/window_type_launcher/window_type_launcher.cc b/mash/example/window_type_launcher/window_type_launcher.cc
index a8b03ed15f4797b13bca5e687237c35da30e958c..5c50a0787961daac80b154202f1d1375d6e65268 100644
--- a/mash/example/window_type_launcher/window_type_launcher.cc
+++ b/mash/example/window_type_launcher/window_type_launcher.cc
@@ -21,6 +21,8 @@
#include "services/service_manager/public/cpp/service.h"
#include "services/service_manager/public/cpp/service_context.h"
#include "services/service_manager/public/cpp/service_runner.h"
+#include "services/ui/public/cpp/property_type_converters.h"
+#include "services/ui/public/interfaces/window_manager.mojom.h"
#include "ui/aura/window.h"
#include "ui/aura/window_event_dispatcher.h"
#include "ui/compositor/layer.h"
@@ -72,12 +74,9 @@ class WindowDelegateView : public views::WidgetDelegateView {
(traits & PANEL) != 0 ? views::Widget::InitParams::TYPE_PANEL
: views::Widget::InitParams::TYPE_WINDOW);
if ((traits & PANEL) != 0) {
- // TODO(sky): make this work with aura-mus.
- /*
params.mus_properties[ui::mojom::WindowManager::kInitialBounds_Property] =
mojo::TypeConverter<std::vector<uint8_t>, gfx::Rect>::Convert(
gfx::Rect(100, 100, 300, 300));
- */
}
params.keep_on_top = (traits & ALWAYS_ON_TOP) != 0;
// WidgetDelegateView deletes itself when Widget is destroyed.

Powered by Google App Engine
This is Rietveld 408576698