Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(237)

Unified Diff: ui/display/win/screen_win.cc

Issue 2489873002: Change GetAllDisplays() in all screens to return a const vector&. (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/display/win/screen_win.cc
diff --git a/ui/display/win/screen_win.cc b/ui/display/win/screen_win.cc
index 86d6be41cd4e4a33e8a7dcc09600930582fa9e3e..55dc04a0cf7fb96e2dca9f2349077c59ce119317 100644
--- a/ui/display/win/screen_win.cc
+++ b/ui/display/win/screen_win.cc
@@ -384,8 +384,8 @@ int ScreenWin::GetNumDisplays() const {
return static_cast<int>(screen_win_displays_.size());
}
-std::vector<display::Display> ScreenWin::GetAllDisplays() const {
- return ScreenWinDisplaysToDisplays(screen_win_displays_);
+const std::vector<display::Display>& ScreenWin::GetAllDisplays() const {
+ return displays_;
}
display::Display ScreenWin::GetDisplayNearestWindow(
@@ -443,6 +443,7 @@ gfx::Rect ScreenWin::DIPToScreenRectInWindow(gfx::NativeView view,
void ScreenWin::UpdateFromDisplayInfos(
const std::vector<DisplayInfo>& display_infos) {
screen_win_displays_ = DisplayInfosToScreenWinDisplays(display_infos);
+ displays_ = ScreenWinDisplaysToDisplays(screen_win_displays_);
}
void ScreenWin::Initialize() {
@@ -487,7 +488,7 @@ void ScreenWin::OnWndProc(HWND hwnd,
if (message != WM_DISPLAYCHANGE)
return;
- std::vector<display::Display> old_displays = GetAllDisplays();
+ const std::vector<display::Display>& old_displays = GetAllDisplays();
sadrul 2016/11/12 02:43:00 This looks a bit tricky. Since |displays_| is gett
robliao 2016/11/12 07:07:00 Nice catch. Agreed on this point. Now that I think
riajiang 2016/11/15 20:08:13 Good point! Done.
riajiang 2016/11/15 20:08:13 We are changing GetAllDisplays() to return a const
UpdateFromDisplayInfos(GetDisplayInfosFromSystem());
change_notifier_.NotifyDisplaysChanged(old_displays, GetAllDisplays());
}

Powered by Google App Engine
This is Rietveld 408576698