Chromium Code Reviews| 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. |
|
James Cook
2016/12/05 17:21:49
services/ui/DEPS allows +ui. Should this include u
sky
2016/12/05 17:56:55
The window-server doesn't link with aura, and I wo
|
| 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; |