| Index: ash/display/display_change_observer_chromeos.cc
|
| diff --git a/ash/display/display_change_observer_chromeos.cc b/ash/display/display_change_observer_chromeos.cc
|
| index 3ff867035644902c29428f1d6f6aa418c52ce9ef..8b3d617ee7b579fb70f9b8c8a3e3ebf96ab21b7d 100644
|
| --- a/ash/display/display_change_observer_chromeos.cc
|
| +++ b/ash/display/display_change_observer_chromeos.cc
|
| @@ -164,7 +164,7 @@ ui::MultipleDisplayState DisplayChangeObserver::GetStateForDisplayIds(
|
| ui::MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED;
|
| }
|
|
|
| -bool DisplayChangeObserver::GetResolutionForDisplayId(int64 display_id,
|
| +bool DisplayChangeObserver::GetResolutionForDisplayId(int64_t display_id,
|
| gfx::Size* size) const {
|
| DisplayMode mode;
|
| if (!Shell::GetInstance()->display_manager()->GetSelectedModeForDisplayId(
|
| @@ -180,7 +180,7 @@ void DisplayChangeObserver::OnDisplayModeChanged(
|
| UpdateInternalDisplayId(display_states);
|
|
|
| std::vector<DisplayInfo> displays;
|
| - std::set<int64> ids;
|
| + std::set<int64_t> ids;
|
| for (const ui::DisplaySnapshot* state : display_states) {
|
| const ui::DisplayMode* mode_info = state->current_mode();
|
| if (!mode_info)
|
| @@ -234,7 +234,7 @@ void DisplayChangeObserver::OnDisplayModeChanged(
|
| name = l10n_util::GetStringUTF8(IDS_ASH_STATUS_TRAY_UNKNOWN_DISPLAY_NAME);
|
|
|
| bool has_overscan = state->has_overscan();
|
| - int64 id = state->display_id();
|
| + int64_t id = state->display_id();
|
| ids.insert(id);
|
|
|
| displays.push_back(DisplayInfo(id, name, has_overscan));
|
|
|