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

ash/display/display_color_manager_chromeos.cc

 // Copyright 2015 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_color_manager_chromeos.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/task_runner_util.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "components/quirks/quirks_manager.h"
 #include "third_party/qcms/src/qcms.h"
+#include "ui/display/display.h"
 #include "ui/display/types/display_snapshot.h"
 #include "ui/display/types/gamma_ramp_rgb_entry.h"
-#include "ui/gfx/display.h"
 
 namespace ash {
 
 namespace {
 
 std::unique_ptr<DisplayColorManager::ColorCalibrationData> ParseDisplayProfile(
     const base::FilePath& path,
     bool has_color_correction_matrix) {
   VLOG(1) << "Trying ICC file " << path.value()
           << " has_color_correction_matrix: "
@@ skipping 150 matching lines @@
     if (!configurator_->SetColorCorrection(display_id, data->degamma_lut,
                                            data->gamma_lut,
                                            data->correction_matrix))
       LOG(WARNING) << "Error applying color correction data";
   }
 }
 
 void DisplayColorManager::LoadCalibrationForDisplay(
     const ui::DisplaySnapshot* display) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  if (display->display_id() == gfx::Display::kInvalidDisplayID) {
+  if (display->display_id() == display::Display::kInvalidDisplayID) {
     LOG(WARNING) << "Trying to load calibration data for invalid display id";
     return;
   }
 
   quirks::QuirksManager::Get()->RequestIccProfilePath(
       display->product_id(),
       base::Bind(&DisplayColorManager::FinishLoadCalibrationForDisplay,
                  weak_ptr_factory_.GetWeakPtr(), display->display_id(),
                  display->product_id(), display->has_color_correction_matrix(),
                  display->type()));
@@ skipping 42 matching lines @@
     calibration_map_[product_id] = data.release();
     ApplyDisplayColorCalibration(display_id, product_id);
   }
 }
 
 DisplayColorManager::ColorCalibrationData::ColorCalibrationData() {}
 
 DisplayColorManager::ColorCalibrationData::~ColorCalibrationData() {}
 
 }  // namespace ash