| Index: ash/display/cursor_window_controller_unittest.cc
|
| diff --git a/ash/display/cursor_window_controller_unittest.cc b/ash/display/cursor_window_controller_unittest.cc
|
| index d1f94458d569da8a9bcb5ffa8f8fde114b409c41..5640bb19a2238690dff054d2f1da731e20d12307 100644
|
| --- a/ash/display/cursor_window_controller_unittest.cc
|
| +++ b/ash/display/cursor_window_controller_unittest.cc
|
| @@ -44,7 +44,7 @@ class CursorWindowControllerTest : public test::AshTestBase {
|
| return cursor_window_controller_->GetCursorImageForTest();
|
| }
|
|
|
| - int64 GetCursorDisplayId() const {
|
| + int64_t GetCursorDisplayId() const {
|
| return cursor_window_controller_->display_.id();
|
| }
|
|
|
| @@ -72,8 +72,8 @@ TEST_F(CursorWindowControllerTest, MoveToDifferentDisplay) {
|
|
|
| WindowTreeHostManager* window_tree_host_manager =
|
| Shell::GetInstance()->window_tree_host_manager();
|
| - int64 primary_display_id = window_tree_host_manager->GetPrimaryDisplayId();
|
| - int64 secondary_display_id = ScreenUtil::GetSecondaryDisplay().id();
|
| + int64_t primary_display_id = window_tree_host_manager->GetPrimaryDisplayId();
|
| + int64_t secondary_display_id = ScreenUtil::GetSecondaryDisplay().id();
|
| aura::Window* primary_root =
|
| window_tree_host_manager->GetRootWindowForDisplayId(primary_display_id);
|
| aura::Window* secondary_root =
|
| @@ -154,7 +154,7 @@ TEST_F(CursorWindowControllerTest, VisibilityTest) {
|
| // the DSF becomes 1x as a result of zooming out.
|
| TEST_F(CursorWindowControllerTest, DSF) {
|
| UpdateDisplay("1000x500*2");
|
| - int64 primary_id = Shell::GetScreen()->GetPrimaryDisplay().id();
|
| + int64_t primary_id = Shell::GetScreen()->GetPrimaryDisplay().id();
|
|
|
| test::ScopedSetInternalDisplayId set_internal(primary_id);
|
| SetCursorCompositionEnabled(true);
|
|
|