Move DisplayLayout and DisplayLayoutBuilder From ash To ui/display

chrome/browser/ui/webui/options/chromeos/display_options_handler.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/webui/options/chromeos/display_options_handler.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <string>
 
 #include "ash/display/display_configuration_controller.h"
-#include "ash/display/display_layout_builder.h"
 #include "ash/display/display_manager.h"
 #include "ash/display/resolution_notification_controller.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/display/display_preferences.h"
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/chromeos_switches.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/display/manager/display_layout.h"
+#include "ui/display/manager/display_layout_builder.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size_conversions.h"
 #include "ui/gfx/screen.h"
 
 namespace chromeos {
 namespace options {
 namespace {
 
 ash::DisplayManager* GetDisplayManager() {
@@ skipping 290 matching lines @@
       if (profile_name.empty())
         continue;
       base::DictionaryValue* color_profile_dict = new base::DictionaryValue();
       color_profile_dict->SetInteger("profileId", color_profile);
       color_profile_dict->SetString("name", profile_name);
       available_color_profiles->Append(color_profile_dict);
     }
     js_display->Set("availableColorProfiles", available_color_profiles);
 
     if (display_manager->GetNumDisplays() > 1) {
-      const ash::DisplayPlacement placement =
+      const display::DisplayPlacement placement =
           display_manager->GetCurrentDisplayLayout().FindPlacementById(
               display.id());
       if (placement.display_id != gfx::Display::kInvalidDisplayID) {
         js_display->SetString(
             "parentId", base::Int64ToString(placement.parent_display_id));
         js_display->SetInteger("layoutType", placement.position);
         js_display->SetInteger("offset", placement.offset);
       }
     }
 
@@ skipping 49 matching lines @@
 }
 
 void DisplayOptionsHandler::HandleSetDisplayLayout(
     const base::ListValue* args) {
   const base::ListValue* layouts = nullptr;
   if (!args->GetList(0, &layouts))
     NOTREACHED();
   content::RecordAction(base::UserMetricsAction("Options_DisplayRearrange"));
 
   ash::DisplayManager* display_manager = GetDisplayManager();
-  ash::DisplayLayoutBuilder builder(display_manager->GetCurrentDisplayLayout());
+  display::DisplayLayoutBuilder builder(
+      display_manager->GetCurrentDisplayLayout());
   builder.ClearPlacements();
   for (const base::Value* layout : *layouts) {
     const base::DictionaryValue* dictionary;
     if (!layout->GetAsDictionary(&dictionary)) {
       LOG(ERROR) << "Invalid layout dictionary: " << *dictionary;
       continue;
     }
 
     int64_t parent_id = GetDisplayIdFromDictionary(dictionary, "parentId");
     if (parent_id == gfx::Display::kInvalidDisplayID)
       continue;  // No placement for root (primary) display.
 
     int64_t display_id = GetDisplayIdFromDictionary(dictionary, "id");
     if (display_id == gfx::Display::kInvalidDisplayID) {
       LOG(ERROR) << "Invalud display id in layout dictionary: " << *dictionary;
       continue;
     }
 
     int position = 0;
     dictionary->GetInteger("layoutType", &position);
     int offset = 0;
     dictionary->GetInteger("offset", &offset);
 
     builder.AddDisplayPlacement(
         display_id, parent_id,
-        static_cast<ash::DisplayPlacement::Position>(position), offset);
+        static_cast<display::DisplayPlacement::Position>(position), offset);
   }
-  scoped_ptr<ash::DisplayLayout> layout = builder.Build();
-  if (!ash::DisplayLayout::Validate(display_manager->GetCurrentDisplayIdList(),
-                                    *layout)) {
+  scoped_ptr<display::DisplayLayout> layout = builder.Build();
+  if (!display::DisplayLayout::Validate(
+          display_manager->GetCurrentDisplayIdList(), *layout)) {
     LOG(ERROR) << "Invalid layout: " << layout->ToString();
     return;
   }
 
   VLOG(1) << "Updating display layout: " << layout->ToString();
   GetDisplayConfigurationController()->SetDisplayLayout(std::move(layout),
                                                         true /* user_action */);
 }
 
 void DisplayOptionsHandler::HandleSetDisplayMode(const base::ListValue* args) {
@@ skipping 100 matching lines @@
   bool enable = false;
   if (!args->GetBoolean(0, &enable))
     NOTREACHED();
 
   GetDisplayManager()->SetDefaultMultiDisplayModeForCurrentDisplays(
       enable ? ash::DisplayManager::UNIFIED : ash::DisplayManager::EXTENDED);
 }
 
 }  // namespace options
 }  // namespace chromeos