Split //ui/display and create //ui/display/manager.

ui/display/display_layout.cc

 // 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 "ui/display/manager/display_layout.h"
+#include "ui/display/display_layout.h"
 
 #include <algorithm>
 #include <set>
 #include <sstream>
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "ui/display/display.h"
 #include "ui/gfx/geometry/insets.h"
 
 namespace display {
-namespace  {
+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
 // to change this value in case to support even larger displays.
@@ skipping 154 matching lines @@
                                        std::vector<int64_t>* updated_ids,
                                        int minimum_offset_overlap) const {
   // Layout from primary, then dependent displays.
   std::set<int64_t> parents;
   parents.insert(primary_id);
   while (parents.size()) {
     int64_t parent_id = *parents.begin();
     parents.erase(parent_id);
     for (const DisplayPlacement& placement : placement_list) {
       if (placement.parent_display_id == parent_id) {
-        if (ApplyDisplayPlacement(placement,
-                                  display_list,
+        if (ApplyDisplayPlacement(placement, display_list,
                                   minimum_offset_overlap) &&
             updated_ids) {
           updated_ids->push_back(placement.display_id);
         }
         parents.insert(placement.display_id);
       }
     }
   }
 }
 
@@ skipping 118 matching lines @@
   DisplayPlacement::Position position = placement.position;
 
   // Ignore the offset in case the target display doesn't share edges with
   // the parent display.
   int offset = placement.offset;
   if (position == DisplayPlacement::TOP ||
       position == DisplayPlacement::BOTTOM) {
     if (placement.offset_reference == DisplayPlacement::BOTTOM_RIGHT)
       offset = parent_bounds.width() - offset - target_bounds.width();
 
-    offset = std::min(
-        offset, parent_bounds.width() - minimum_offset_overlap);
-    offset = std::max(
-        offset, -target_bounds.width() + minimum_offset_overlap);
+    offset = std::min(offset, parent_bounds.width() - minimum_offset_overlap);
+    offset = std::max(offset, -target_bounds.width() + minimum_offset_overlap);
   } else {
     if (placement.offset_reference == DisplayPlacement::BOTTOM_RIGHT)
       offset = parent_bounds.height() - offset - target_bounds.height();
 
-    offset = std::min(
-        offset, parent_bounds.height() - minimum_offset_overlap);
-    offset = std::max(
-        offset, -target_bounds.height() + minimum_offset_overlap);
+    offset = std::min(offset, parent_bounds.height() - minimum_offset_overlap);
+    offset = std::max(offset, -target_bounds.height() + minimum_offset_overlap);
   }
   switch (position) {
     case DisplayPlacement::TOP:
       new_target_origin.Offset(offset, -target_bounds.height());
       break;
     case DisplayPlacement::RIGHT:
       new_target_origin.Offset(parent_bounds.width(), offset);
       break;
     case DisplayPlacement::BOTTOM:
       new_target_origin.Offset(offset, parent_bounds.height());
       break;
     case DisplayPlacement::LEFT:
       new_target_origin.Offset(-target_bounds.width(), offset);
       break;
   }
 
   gfx::Insets insets = target_display->GetWorkAreaInsets();
   target_display->set_bounds(
       gfx::Rect(new_target_origin, target_bounds.size()));
   target_display->UpdateWorkAreaFromInsets(insets);
 
   return old_bounds != target_display->bounds();
 }
 
 }  // namespace display