Move DisplayLayout and DisplayLayoutBuilder From ash To ui/display

ui/display/manager/display_layout.cc

Index: ui/display/manager/display_layout.cc
diff --git a/ash/display/display_layout.cc b/ui/display/manager/display_layout.cc
similarity index 96%
rename from ash/display/display_layout.cc
rename to ui/display/manager/display_layout.cc
index 1cc7b7fba66f5592b4a8c48af14cc12c344128c0..b41b802ae5f63838b0b89fa7f8db1fbebe258532 100644
--- a/ash/display/display_layout.cc
+++ b/ui/display/manager/display_layout.cc
@@ -1,22 +1,19 @@
-// 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
@@ -256,4 +253,4 @@ DisplayPlacement DisplayLayout::FindPlacementById(int64_t display_id) const {
                                         : DisplayPlacement(*iter);
 }
 
-}  // namespace ash
+}  // namespace gfx

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

display

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

Done.