Remove unnsed parameter in SetDisplayLayout

Use DisplayIdList in RegisterLayoutForDisplayIdList

BUG=582491
TBR=benwells@chromium.org

Review URL: https://codereview.chromium.org/1659373004

Cr-Commit-Position: refs/heads/master@{#373575}

6 files changed, 23 insertions, 26 deletions

diff --git a/ash/display/display_configuration_controller.cc b/ash/display/display_configuration_controller.cc
index 132afc5..c82bcd4 100644
--- a/ash/display/display_configuration_controller.cc
+++ b/ash/display/display_configuration_controller.cc
@@ -68,15 +68,14 @@ DisplayConfigurationController::~DisplayConfigurationController() {
 }
 
 void DisplayConfigurationController::SetDisplayLayout(
-    int64_t display_id,
     const DisplayLayout& layout,
     bool user_action) {
   if (user_action && display_animator_) {
     display_animator_->StartFadeOutAnimation(
         base::Bind(&DisplayConfigurationController::SetDisplayLayoutImpl,
-                   weak_ptr_factory_.GetWeakPtr(), display_id, layout));
+                   weak_ptr_factory_.GetWeakPtr(), layout));
   } else {
-    SetDisplayLayoutImpl(display_id, layout);
+    SetDisplayLayoutImpl(layout);
   }
 }
 
@@ -142,7 +141,6 @@ bool DisplayConfigurationController::IsLimited() {
 }
 
 void DisplayConfigurationController::SetDisplayLayoutImpl(
-    int64_t display_id,
     const DisplayLayout& layout) {
   // TODO(oshima/stevenjb): Add support for 3+ displays.
   display_manager_->SetLayoutForCurrentDisplays(layout);
diff --git a/ash/display/display_configuration_controller.h b/ash/display/display_configuration_controller.h
index 8003ae9..1e2425f 100644
--- a/ash/display/display_configuration_controller.h
+++ b/ash/display/display_configuration_controller.h
@@ -35,12 +35,10 @@ class ASH_EXPORT DisplayConfigurationController
       WindowTreeHostManager* window_tree_host_manager);
   ~DisplayConfigurationController() override;
 
-  // Sets the layout for |display_id| with a fade in/out animation. Currently
-  // |display_id| is assumed to be the secondary display.
-  // TODO(oshima/stevenjb): Support 3+ displays.
-  void SetDisplayLayout(int64_t display_id,
-                        const DisplayLayout& layout,
-                        bool user_action);
+  // Sets the layout for the current displays with a fade in/out
+  // animation. Currently |display_id| is assumed to be the secondary
+  // display.  TODO(oshima/stevenjb): Support 3+ displays.
+  void SetDisplayLayout(const DisplayLayout& layout, bool user_action);
 
   // Sets the mirror mode with a fade-in/fade-out animation. Affects all
   // displays.
@@ -68,7 +66,7 @@ class ASH_EXPORT DisplayConfigurationController
   class DisplayChangeLimiter;
 
   bool IsLimited();
-  void SetDisplayLayoutImpl(int64_t display_id, const DisplayLayout& layout);
+  void SetDisplayLayoutImpl(const DisplayLayout& layout);
   void SetMirrorModeImpl(bool mirror);
   void SetPrimaryDisplayIdImpl(int64_t display_id);
 
diff --git a/ash/display/display_layout_store.cc b/ash/display/display_layout_store.cc
index 111e679..ad14e66 100644
--- a/ash/display/display_layout_store.cc
+++ b/ash/display/display_layout_store.cc
@@ -46,16 +46,15 @@ void DisplayLayoutStore::SetDefaultDisplayLayout(const DisplayLayout& layout) {
 }
 
 void DisplayLayoutStore::RegisterLayoutForDisplayIdList(
-    int64_t id1,
-    int64_t id2,
+    const DisplayIdList& list,
     const DisplayLayout& layout) {
-  auto key = CreateDisplayIdList(id1, id2);
+  DCHECK_EQ(2u, list.size());
 
   // Do not overwrite the valid data with old invalid date.
-  if (layouts_.count(key) && !CompareDisplayIds(id1, id2))
+  if (layouts_.count(list) && !CompareDisplayIds(list[0], list[1]))
     return;
 
-  layouts_[key] = layout;
+  layouts_[list] = layout;
 }
 
 DisplayLayout DisplayLayoutStore::GetRegisteredDisplayLayout(
diff --git a/ash/display/display_layout_store.h b/ash/display/display_layout_store.h
index 84c8b69..f66bcd5 100644
--- a/ash/display/display_layout_store.h
+++ b/ash/display/display_layout_store.h
@@ -26,8 +26,7 @@ class ASH_EXPORT DisplayLayoutStore {
   void SetDefaultDisplayLayout(const DisplayLayout& layout);
 
   // Registeres the display layout info for the specified display(s).
-  void RegisterLayoutForDisplayIdList(int64_t id1,
-                                      int64_t id2,
+  void RegisterLayoutForDisplayIdList(const DisplayIdList& list,
                                       const DisplayLayout& layout);
 
   // If no layout is registered, it creatas new layout using
diff --git a/ash/display/display_manager.cc b/ash/display/display_manager.cc
index 93bec38..30eacfa 100644
--- a/ash/display/display_manager.cc
+++ b/ash/display/display_manager.cc
@@ -259,7 +259,7 @@ void DisplayManager::SetLayoutForCurrentDisplays(
   if (to_set.position != current_layout.position ||
       to_set.offset != current_layout.offset) {
     to_set.primary_id = primary.id();
-    layout_store_->RegisterLayoutForDisplayIdList(list[0], list[1], to_set);
+    layout_store_->RegisterLayoutForDisplayIdList(list, to_set);
     if (delegate_)
       delegate_->PreDisplayConfigurationChange(false);
     // PreDisplayConfigurationChange(false);
diff --git a/ash/display/display_manager_unittest.cc b/ash/display/display_manager_unittest.cc
index 8e0dccd..9b89506 100644
--- a/ash/display/display_manager_unittest.cc
+++ b/ash/display/display_manager_unittest.cc
@@ -1606,7 +1606,7 @@ TEST_F(DisplayManagerTest, UnifiedDesktopWithHardwareMirroring) {
   DisplayLayout layout =
       display_manager()->layout_store()->GetRegisteredDisplayLayout(list);
   layout.mirrored = false;
-  display_manager()->layout_store()->RegisterLayoutForDisplayIdList(1, 2,
+  display_manager()->layout_store()->RegisterLayoutForDisplayIdList(list,
                                                                     layout);
 
   // Exit from hardware mirroring.
@@ -1630,8 +1630,8 @@ TEST_F(DisplayManagerTest, UnifiedDesktopEnabledWithExtended) {
   DisplayLayout layout =
       display_manager()->layout_store()->GetRegisteredDisplayLayout(list);
   layout.default_unified = false;
-  display_manager()->layout_store()->RegisterLayoutForDisplayIdList(
-      list[0], list[1], layout);
+  display_manager()->layout_store()->RegisterLayoutForDisplayIdList(list,
+                                                                    layout);
   display_manager()->SetUnifiedDesktopEnabled(true);
   EXPECT_FALSE(display_manager()->IsInUnifiedMode());
 }
@@ -2025,13 +2025,16 @@ TEST_F(DisplayManagerTest, RejectInvalidLayoutData) {
   ASSERT_TRUE(CompareDisplayIds(id1, id2));
   DisplayLayout good(DisplayLayout(DisplayLayout::LEFT, 0));
   good.primary_id = id1;
-
-  layout_store->RegisterLayoutForDisplayIdList(id1, id2, good);
+  DisplayIdList list(2);
+  list[0] = id1;
+  list[1] = id2;
+  layout_store->RegisterLayoutForDisplayIdList(list, good);
 
   DisplayLayout bad(DisplayLayout(DisplayLayout::BOTTOM, 0));
   good.primary_id = id2;
-
-  layout_store->RegisterLayoutForDisplayIdList(id2, id1, bad);
+  list[0] = id2;
+  list[1] = id1;
+  layout_store->RegisterLayoutForDisplayIdList(list, bad);
 
   EXPECT_EQ(
       good.ToString(),