Remove ui/gfx/screen_type_delegate.h

chrome/browser/ui/window_sizer/window_sizer.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/window_sizer/window_sizer.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
@@ skipping 179 matching lines @@
 
 ///////////////////////////////////////////////////////////////////////////////
 // WindowSizer, public:
 
 WindowSizer::WindowSizer(
     scoped_ptr<StateProvider> state_provider,
     scoped_ptr<TargetDisplayProvider> target_display_provider,
     const Browser* browser)
     : state_provider_(std::move(state_provider)),
       target_display_provider_(std::move(target_display_provider)),
-      // TODO(scottmg): NativeScreen is wrong. http://crbug.com/133312
-      screen_(gfx::Screen::GetNativeScreen()),
+      screen_(gfx::Screen::GetScreen()),
       browser_(browser) {}
 
 WindowSizer::WindowSizer(
     scoped_ptr<StateProvider> state_provider,
     scoped_ptr<TargetDisplayProvider> target_display_provider,
     gfx::Screen* screen,
     const Browser* browser)
     : state_provider_(std::move(state_provider)),
       target_display_provider_(std::move(target_display_provider)),
       screen_(screen),
@@ skipping 232 matching lines @@
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kStartMaximized))
     return ui::SHOW_STATE_MAXIMIZED;
 
   if (browser_->initial_show_state() != ui::SHOW_STATE_DEFAULT)
     return browser_->initial_show_state();
 
   // Otherwise we use the default which can be overridden later on.
   return ui::SHOW_STATE_DEFAULT;
 }