diff options
| author | John Abd-El-Malek <jam@chromium.org> | 2015-04-02 11:32:55 -0700 |
|---|---|---|
| committer | John Abd-El-Malek <jam@chromium.org> | 2015-04-02 18:34:20 +0000 |
| commit | 8cd7f113715845b012655f22f7f8cc7fbab960d6 (patch) | |
| tree | 5ab43df9b55c0e900a4ec8b1408d09971c5b25d3 /mojo/services/window_manager/window_manager_apptest.cc | |
| parent | b28b931bd2659b0bdc63e4bd8fbfa0a22da61e9b (diff) | |
| download | chromium_src-8cd7f113715845b012655f22f7f8cc7fbab960d6.zip chromium_src-8cd7f113715845b012655f22f7f8cc7fbab960d6.tar.gz chromium_src-8cd7f113715845b012655f22f7f8cc7fbab960d6.tar.bz2 | |
Fix win and mac GN failures.
R=scottmg@chromium.org
Review URL: https://codereview.chromium.org/1055103002
Cr-Commit-Position: refs/heads/master@{#323542}
Diffstat (limited to 'mojo/services/window_manager/window_manager_apptest.cc')
| -rw-r--r-- | mojo/services/window_manager/window_manager_apptest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mojo/services/window_manager/window_manager_apptest.cc b/mojo/services/window_manager/window_manager_apptest.cc index 12a9aca..7f82211 100644 --- a/mojo/services/window_manager/window_manager_apptest.cc +++ b/mojo/services/window_manager/window_manager_apptest.cc @@ -184,9 +184,9 @@ struct FocusedAndActiveViewsCallback { TEST_F(WindowManagerApplicationTest, GetFocusedAndActiveViewsFailsWithoutFC) { EmbedApplicationWithURL(application_impl()->url()); - uint32 capture_view_id = -1; - uint32 focused_view_id = -1; - uint32 active_view_id = -1; + uint32 capture_view_id = static_cast<uint32>(-1); + uint32 focused_view_id = static_cast<uint32>(-1); + uint32 active_view_id = static_cast<uint32>(-1); base::RunLoop run_loop; WindowManagerObserverPtr observer; |