Move DisplayLayout and DisplayLayoutBuilder From ash To ui/display

ui/display/manager/display_layout.cc

-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2016 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/display_layout.h"
+#include "ui/display/manager/display_layout.h"
 
 #include <algorithm>
 #include <sstream>
 
-#include "ash/ash_switches.h"
-#include "ash/display/display_pref_util.h"
-#include "ash/shell.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "ui/gfx/display.h"
 
-namespace ash {
+namespace display {
 namespace  {
 
 // DisplayPlacement Positions
 const char kTop[] = "top";
 const char kRight[] = "right";
 const char kBottom[] = "bottom";
 const char kLeft[] = "left";
 const char kUnknown[] = "unknown";
 
 // The maximum value for 'offset' in DisplayLayout in case of outliers.  Need
@@ skipping 219 matching lines @@
 DisplayPlacement DisplayLayout::FindPlacementById(int64_t display_id) const {
   const auto iter =
       std::find_if(placement_list.begin(), placement_list.end(),
                    [display_id](const DisplayPlacement& placement) {
                      return placement.display_id == display_id;
                    });
   return (iter == placement_list.end()) ? DisplayPlacement()
                                         : DisplayPlacement(*iter);
 }
 
-}  // namespace ash
+}  // namespace gfx

[oshima, 2016/04/07 19:54:21]

display

[robliao, 2016/04/07 20:10:21]

Done.