diff options
author | reillyg <reillyg@chromium.org> | 2014-11-02 22:40:26 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-11-03 06:40:49 +0000 |
commit | dbd94f7916ed11a14deddaa53db6f84ce5fd1b57 (patch) | |
tree | f4b3e1bd884007fc4a41bec7572212baece12f20 /extensions | |
parent | 1870b34b26ad58d36845e8932959f06350e1543c (diff) | |
download | chromium_src-dbd94f7916ed11a14deddaa53db6f84ce5fd1b57.zip chromium_src-dbd94f7916ed11a14deddaa53db6f84ce5fd1b57.tar.gz chromium_src-dbd94f7916ed11a14deddaa53db6f84ce5fd1b57.tar.bz2 |
Don't assume gfx::Screen::GetNumDisplays() == GetAllDisplays().size().
It is safer to use the C++11 foreach operator to iterate over this
vector. On Windows gfx::ScreenWin gets the the display count from a
different place from the display list.
BUG=427931
Review URL: https://codereview.chromium.org/689223002
Cr-Commit-Position: refs/heads/master@{#302416}
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/browser/api/system_display/display_info_provider.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extensions/browser/api/system_display/display_info_provider.cc b/extensions/browser/api/system_display/display_info_provider.cc index da36508..50a4c93 100644 --- a/extensions/browser/api/system_display/display_info_provider.cc +++ b/extensions/browser/api/system_display/display_info_provider.cc @@ -80,10 +80,10 @@ DisplayInfo DisplayInfoProvider::GetAllDisplaysInfo() { int64 primary_id = screen->GetPrimaryDisplay().id(); std::vector<gfx::Display> displays = screen->GetAllDisplays(); DisplayInfo all_displays; - for (int i = 0; i < screen->GetNumDisplays(); ++i) { + for (const gfx::Display& display : displays) { linked_ptr<core_api::system_display::DisplayUnitInfo> unit( - CreateDisplayUnitInfo(displays[i], primary_id)); - UpdateDisplayUnitInfoForPlatform(displays[i], unit.get()); + CreateDisplayUnitInfo(display, primary_id)); + UpdateDisplayUnitInfoForPlatform(display, unit.get()); all_displays.push_back(unit); } return all_displays; |