[Cleanup] Screen cleanup

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

 // Copyright (c) 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 "chrome/browser/ui/webui/options/chromeos/display_overscan_handler.h"
 
 #include <string>
 
 #include "ash/display/display_controller.h"
-#include "ash/screen_ash.h"
+#include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/display/overscan_calibrator.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/display.h"
+#include "ui/gfx/screen.h"
 
 namespace chromeos {
 namespace options {
 namespace {
 
 // The value for the orientation of overscan operations.
 const char kOrientationHorizontal[] = "horizontal";
 const char kOrientationVertical[] = "vertical";
 
 }
@@ skipping 70 matching lines @@
     LOG(ERROR) << "Can't find ID";
     return;
   }
 
   if (!base::StringToInt64(id_value, &display_id) ||
       display_id == gfx::Display::kInvalidDisplayID) {
     LOG(ERROR) << "Invalid parameter: " << id_value;
     return;
   }
 
-  const gfx::Display& display = ash::ScreenAsh::GetDisplayForId(display_id);
+  const gfx::Display& display = ash::ScreenUtil::GetDisplayForId(display_id);
   DCHECK(display.is_valid());
   if (!display.is_valid())
     return;
 
   ash::DisplayController* display_controller =
       ash::Shell::GetInstance()->display_controller();
   overscan_calibrator_.reset(new OverscanCalibrator(
       display,
       display_controller->GetOverscanInsets(display_id)));
 }
@@ skipping 71 matching lines @@
     LOG(ERROR) << "The orientation must be '" << kOrientationHorizontal
                << "' or '" << kOrientationVertical << "': "
                << orientation;
     return;
   }
   overscan_calibrator_->UpdateInsets(insets);
 }
 
 }  // namespace options
 }  // namespace chromeos