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

Unified Diff: chrome/browser/ui/ash/property_util.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: chrome/browser/ui/ash/property_util.cc
diff --git a/chrome/browser/ui/ash/property_util.cc b/chrome/browser/ui/ash/property_util.cc
index 761a3a14f32298e07e458a30a6e2fec6ee100e2d..6a5899b8008782c7b3caa1b13580c40e472acb39 100644
--- a/chrome/browser/ui/ash/property_util.cc
+++ b/chrome/browser/ui/ash/property_util.cc
@@ -11,6 +11,7 @@
#include "services/ui/public/cpp/window_property.h"
#include "services/ui/public/interfaces/window_manager.mojom.h"
#include "ui/aura/mus/mus_util.h"
+#include "ui/aura/mus/property_converter.h"
namespace {
@@ -32,8 +33,9 @@ void SetIntProperty(aura::Window* window,
int value) {
DCHECK(window);
if (chrome::IsRunningInMash()) {
- aura::GetMusWindow(window)->SetSharedProperty<int>(GetMusProperty(property),
- value);
+ aura::GetMusWindow(window)
+ ->SetSharedProperty<aura::PropertyConverter::PrimitiveType>(
+ GetMusProperty(property), value);
} else {
window->SetProperty(property, value);
}

Powered by Google App Engine
This is Rietveld 408576698