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

Unified Diff: ui/views/mus/native_widget_mus_unittest.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
« ui/views/mus/native_widget_mus.cc ('K') | « ui/views/mus/native_widget_mus.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/mus/native_widget_mus_unittest.cc
diff --git a/ui/views/mus/native_widget_mus_unittest.cc b/ui/views/mus/native_widget_mus_unittest.cc
index 0ef78eca005e723330374daf0afcf48a29f7c8b0..20980e596b155aa0447400da0c0ae1a640139393 100644
--- a/ui/views/mus/native_widget_mus_unittest.cc
+++ b/ui/views/mus/native_widget_mus_unittest.cc
@@ -16,6 +16,7 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "third_party/skia/include/core/SkColor.h"
+#include "ui/aura/mus/property_converter.h"
#include "ui/aura/window.h"
#include "ui/events/event.h"
#include "ui/events/test/test_event_handler.h"
@@ -622,9 +623,10 @@ TEST_F(NativeWidgetMusTest, IsMaximized) {
params.native_widget = new NativeWidgetMus(
widget.get(), window, ui::mojom::CompositorFrameSinkType::DEFAULT);
widget->Init(params);
- window->SetSharedProperty<int32_t>(
+ window->SetSharedProperty<aura::PropertyConverter::PrimitiveType>(
ui::mojom::WindowManager::kShowState_Property,
- static_cast<uint32_t>(ui::mojom::ShowState::MAXIMIZED));
+ static_cast<aura::PropertyConverter::PrimitiveType>(
+ ui::mojom::ShowState::MAXIMIZED));
EXPECT_TRUE(widget->IsMaximized());
}
« ui/views/mus/native_widget_mus.cc ('K') | « ui/views/mus/native_widget_mus.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698