Rename gfx::Display/Screen to display::Display/Screen in ash

ash/display/display_layout_store.cc

 // Copyright 2013 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 <stdio.h>
 
 #include "ash/ash_switches.h"
 #include "ash/display/display_layout_store.h"
 #include "ash/display/display_manager.h"
 #include "ash/display/display_util.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/logging.h"
-#include "ui/gfx/display.h"
+#include "ui/display/display.h"
 
 namespace ash {
 
 DisplayLayoutStore::DisplayLayoutStore()
     : default_display_placement_(display::DisplayPlacement::RIGHT, 0) {
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kAshSecondaryDisplayLayout)) {
     std::string value = command_line->GetSwitchValueASCII(
         switches::kAshSecondaryDisplayLayout);
     char layout;
@@ skipping 30 matching lines @@
   if (list.size() == 2 && layout->placement_list.size() > 1)
     return;
 
   // Do not overwrite the valid data with old invalid date.
   if (layouts_.count(list) && !CompareDisplayIds(list[0], list[1]))
     return;
 
   // Old data may not have the display_id/parent_display_id.
   // Guess these values based on the saved primary_id.
   if (layout->placement_list.size() >= 1 &&
-      layout->placement_list[0].display_id == gfx::Display::kInvalidDisplayID) {
+      layout->placement_list[0].display_id ==
+          display::Display::kInvalidDisplayID) {
     if (layout->primary_id == list[1]) {
       layout->placement_list[0].display_id = list[0];
       layout->placement_list[0].parent_display_id = list[1];
     } else {
       layout->placement_list[0].display_id = list[1];
       layout->placement_list[0].parent_display_id = list[0];
     }
   }
   DCHECK(display::DisplayLayout::Validate(list, *layout.get()))
       << "ids=" << DisplayIdListToString(list)
       << ", layout=" << layout->ToString();
   layouts_[list] = std::move(layout);
 }
 
 const display::DisplayLayout& DisplayLayoutStore::GetRegisteredDisplayLayout(
     const display::DisplayIdList& list) {
   DCHECK_NE(1u, list.size());
   const auto iter = layouts_.find(list);
   const display::DisplayLayout* layout = iter != layouts_.end()
                                              ? iter->second.get()
                                              : CreateDefaultDisplayLayout(list);
   DCHECK(display::DisplayLayout::Validate(list, *layout)) << layout->ToString();
-  DCHECK_NE(layout->primary_id, gfx::Display::kInvalidDisplayID);
+  DCHECK_NE(layout->primary_id, display::Display::kInvalidDisplayID);
   return *layout;
 }
 
 void DisplayLayoutStore::UpdateMultiDisplayState(
     const display::DisplayIdList& list,
     bool mirrored,
     bool default_unified) {
   DCHECK(layouts_.find(list) != layouts_.end());
   if (layouts_.find(list) == layouts_.end())
     CreateDefaultDisplayLayout(list);
@@ skipping 13 matching lines @@
     placement.display_id = list[i + 1];
     placement.parent_display_id = list[i];
     layout->placement_list.push_back(placement);
   }
   layouts_[list] = std::move(layout);
   auto iter = layouts_.find(list);
   return iter->second.get();
 }
 
 }  // namespace ash