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

Unified Diff: services/ui/ws/focus_controller.cc

Issue 2539363005: Converts ash to use aura-mus (Closed)
Patch Set: add overrides 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
« no previous file with comments | « mash/test/mash_test_suite.cc ('k') | testing/buildbot/chromium.chromiumos.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/ws/focus_controller.cc
diff --git a/services/ui/ws/focus_controller.cc b/services/ui/ws/focus_controller.cc
index 8ee22801bd050d5e70537c7d1e4e9b728226e11e..6dcf9fbfad1746720308c8708ad93abe161fcbe0 100644
--- a/services/ui/ws/focus_controller.cc
+++ b/services/ui/ws/focus_controller.cc
@@ -185,9 +185,10 @@ bool FocusController::CanBeActivated(ServerWindow* window) const {
bool is_minimized = false;
const ServerWindow::Properties& props = window->properties();
if (props.count(mojom::WindowManager::kShowState_Property)) {
+ // The type must match that of PropertyConverter::PrimitiveType.
is_minimized =
props.find(mojom::WindowManager::kShowState_Property)->second[0] ==
- static_cast<int>(ui::mojom::ShowState::MINIMIZED);
+ static_cast<int64_t>(ui::mojom::ShowState::MINIMIZED);
}
if (!is_minimized)
return false;
« no previous file with comments | « mash/test/mash_test_suite.cc ('k') | testing/buildbot/chromium.chromiumos.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698