Remove ui/gfx/screen_type_delegate.h

chrome/browser/ui/panels/display_settings_provider.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/panels/display_settings_provider.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "chrome/browser/fullscreen.h"
@@ skipping 48 matching lines @@
 void DisplaySettingsProvider::RemoveFullScreenObserver(
     FullScreenObserver* observer) {
   full_screen_observers_.RemoveObserver(observer);
 
   if (!full_screen_observers_.might_have_observers())
     full_screen_mode_timer_.Stop();
 }
 
 // TODO(scottmg): This should be moved to ui/.
 gfx::Rect DisplaySettingsProvider::GetPrimaryDisplayArea() const {
-  // TODO(scottmg): NativeScreen is wrong. http://crbug.com/133312
-  return gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().bounds();
+  return gfx::Screen::GetScreen()->GetPrimaryDisplay().bounds();
 }
 
 gfx::Rect DisplaySettingsProvider::GetPrimaryWorkArea() const {
 #if defined(OS_MACOSX)
   // On OSX, panels should be dropped all the way to the bottom edge of the
   // screen (and overlap Dock). And we also want to exclude the system menu
   // area. Note that the rect returned from gfx::Screen util functions is in
   // platform-independent screen coordinates with (0, 0) as the top-left corner.
-  // TODO(scottmg): NativeScreen is wrong. http://crbug.com/133312
-  gfx::Display display = gfx::Screen::GetNativeScreen()->GetPrimaryDisplay();
+  gfx::Display display = gfx::Screen::GetScreen()->GetPrimaryDisplay();
   gfx::Rect display_area = display.bounds();
   gfx::Rect work_area = display.work_area();
   int system_menu_height = work_area.y() - display_area.y();
   if (system_menu_height > 0) {
     display_area.set_y(display_area.y() + system_menu_height);
     display_area.set_height(display_area.height() - system_menu_height);
   }
   return display_area;
 #else
-  // TODO(scottmg): NativeScreen is wrong. http://crbug.com/133312
-  return gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().work_area();
+  return gfx::Screen::GetScreen()->GetPrimaryDisplay().work_area();
 #endif
 }
 
 gfx::Rect DisplaySettingsProvider::GetDisplayAreaMatching(
     const gfx::Rect& bounds) const {
-  // TODO(scottmg): NativeScreen is wrong. http://crbug.com/133312
-  return gfx::Screen::GetNativeScreen()->GetDisplayMatching(bounds).bounds();
+  return gfx::Screen::GetScreen()->GetDisplayMatching(bounds).bounds();
 }
 
 gfx::Rect DisplaySettingsProvider::GetWorkAreaMatching(
     const gfx::Rect& bounds) const {
-  // TODO(scottmg): NativeScreen is wrong. http://crbug.com/133312
-  gfx::Screen* screen = gfx::Screen::GetNativeScreen();
+  gfx::Screen* screen = gfx::Screen::GetScreen();
   gfx::Display display = screen->GetDisplayMatching(bounds);
   if (display.bounds() == screen->GetPrimaryDisplay().bounds())
     return GetPrimaryWorkArea();
   return display.work_area();
 }
 
 void DisplaySettingsProvider::OnDisplaySettingsChanged() {
   FOR_EACH_OBSERVER(DisplayObserver, display_observers_, OnDisplayChanged());
 }
 
@@ skipping 46 matching lines @@
 bool DisplaySettingsProvider::IsFullScreen() {
   return IsFullScreenMode();
 }
 
 #if defined(USE_AURA)
 // static
 DisplaySettingsProvider* DisplaySettingsProvider::Create() {
   return new DisplaySettingsProvider();
 }
 #endif