Add GetDisplayWithDisplayId to display::Screen.

ash/display/screen_ash.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/display/screen_ash.h"
 
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/shelf/shelf_widget.h"
 #include "ash/common/wm/root_window_finder.h"
 #include "ash/display/display_manager.h"
@@ skipping 30 matching lines @@
   // display::Screen overrides:
   gfx::Point GetCursorScreenPoint() override { return gfx::Point(); }
   bool IsWindowUnderCursor(gfx::NativeWindow window) override { return false; }
   gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) override {
     return NULL;
   }
   int GetNumDisplays() const override { return display_list_.size(); }
   std::vector<display::Display> GetAllDisplays() const override {
     return display_list_;
   }
+  bool GetDisplayWithDisplayId(int64_t display_id,
+                               display::Display* display) const override {
+    for (display::Display display_in_list : display_list_) {

[sadrul, 2016/09/23 19:51:12]

const&

[riajiang, 2016/10/05 14:54:11]

Done.

+      if (display_in_list.id() == display_id) {
+        *display = display_in_list;
+        return true;
+      }
+    }
+    return false;
+  }
   display::Display GetDisplayNearestWindow(
       gfx::NativeView view) const override {
     return primary_display_;
   }
   display::Display GetDisplayNearestPoint(
       const gfx::Point& point) const override {
     return *display::FindDisplayNearestPoint(display_list_, point);
   }
   display::Display GetDisplayMatching(
       const gfx::Rect& match_rect) const override {
@@ skipping 46 matching lines @@
 }
 
 int ScreenAsh::GetNumDisplays() const {
   return GetDisplayManager()->GetNumDisplays();
 }
 
 std::vector<display::Display> ScreenAsh::GetAllDisplays() const {
   return GetDisplayManager()->active_display_list();
 }
 
+bool ScreenAsh::GetDisplayWithDisplayId(int64_t display_id,
+                                        display::Display* display) const {
+  for (display::Display display_in_list : GetAllDisplays()) {

[sadrul, 2016/09/23 19:51:12]

GetAllDisplays() makes a copy of the list. It'd be better to iterate over the
list without having to create a copy of it first. So this should be like:

  for (const Display& d : GetDisplayManager()->active_display_list()) {
    ....
  }

[riajiang, 2016/10/05 14:54:11]

I see. Done.

+    if (display_in_list.id() == display_id) {
+      *display = display_in_list;
+      return true;
+    }
+  }
+  return false;
+}
+
 display::Display ScreenAsh::GetDisplayNearestWindow(
     gfx::NativeView window) const {
   if (!window)
     return GetPrimaryDisplay();
   const aura::Window* root_window = window->GetRootWindow();
   if (!root_window)
     return GetPrimaryDisplay();
   const RootWindowSettings* rws = GetRootWindowSettings(root_window);
   int64_t id = rws->display_id;
   // if id is |kInvaildDisplayID|, it's being deleted.
@@ skipping 61 matching lines @@
 }
 
 // static
 void ScreenAsh::CreateScreenForShutdown() {
   delete screen_for_shutdown;
   screen_for_shutdown = new ScreenForShutdown(display::Screen::GetScreen());
   display::Screen::SetScreenInstance(screen_for_shutdown);
 }
 
 }  // namespace ash