Remove now-unnecessary wrappers around gfx::Screen::GetScreen()

chrome/browser/extensions/display_info_provider_win.cc

 // Copyright 2014 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/extensions/display_info_provider_win.h"
 
 #include <windows.h>
 #include <stddef.h>
 
 #include "base/hash.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/win_util.h"
 #include "extensions/common/api/system_display.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/screen.h"

[oshima, 2016/01/20 06:40:12]

remove this?

[scottmg, 2016/01/26 20:46:35]

Done.

 #include "ui/gfx/win/dpi.h"
 
 namespace extensions {
 
 using api::system_display::DisplayUnitInfo;
 
 namespace {
 
 BOOL CALLBACK
 EnumMonitorCallback(HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM data) {
@@ skipping 48 matching lines @@
   for (size_t i = 0; i < all_displays.size(); ++i) {
     if (unit->id == all_displays[i]->id) {
       unit->name = all_displays[i]->name;
       unit->dpi_x = all_displays[i]->dpi_x;
       unit->dpi_y = all_displays[i]->dpi_y;
       break;
     }
   }
 }
 
-gfx::Screen* DisplayInfoProviderWin::GetActiveScreen() {
-  return gfx::Screen::GetScreen();
-}
-
 // static
 DisplayInfoProvider* DisplayInfoProvider::Create() {
   return new DisplayInfoProviderWin();
 }
 
 }  // namespace extensions