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

Unified Diff: ash/touch_hud/mus/touch_hud_application.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: ash/touch_hud/mus/touch_hud_application.cc
diff --git a/ash/touch_hud/mus/touch_hud_application.cc b/ash/touch_hud/mus/touch_hud_application.cc
index d6ab7cb2ec87686f75706483c61662d34fa3c7ff..c8af21c7d28627e54135fe971ad35c2454fc36b1 100644
--- a/ash/touch_hud/mus/touch_hud_application.cc
+++ b/ash/touch_hud/mus/touch_hud_application.cc
@@ -14,6 +14,7 @@
#include "services/service_manager/public/cpp/service_context.h"
#include "services/ui/public/cpp/property_type_converters.h"
#include "services/ui/public/interfaces/window_manager_constants.mojom.h"
+#include "ui/aura/mus/property_converter.h"
#include "ui/views/mus/aura_init.h"
#include "ui/views/mus/native_widget_mus.h"
#include "ui/views/mus/pointer_watcher_event_router.h"
@@ -97,7 +98,8 @@ void TouchHudApplication::Launch(uint32_t what, mash::mojom::LaunchMode how) {
ash::kShellWindowId_OverlayContainer);
properties[ui::mojom::WindowManager::kShowState_Property] =
mojo::ConvertTo<std::vector<uint8_t>>(
- static_cast<int32_t>(ui::mojom::ShowState::FULLSCREEN));
+ static_cast<aura::PropertyConverter::PrimitiveType>(
+ ui::mojom::ShowState::FULLSCREEN));
ui::Window* window =
window_manager_connection_.get()->NewTopLevelWindow(properties);
params.native_widget = new views::NativeWidgetMus(

Powered by Google App Engine
This is Rietveld 408576698