Remove ui/gfx/screen_type_delegate.h

ui/views/widget/tooltip_manager.h

 // Copyright (c) 2011 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.
 
 #ifndef UI_VIEWS_WIDGET_TOOLTIP_MANAGER_H_
 #define UI_VIEWS_WIDGET_TOOLTIP_MANAGER_H_
 
 #include <string>
 
 #include "base/strings/string16.h"
 #include "ui/gfx/native_widget_types.h"

[sky, 2016/01/19 22:47:55]

Hopefully you can remove this include now.

[scottmg, 2016/01/20 00:52:57]

Done.

 #include "ui/views/views_export.h"
 
 namespace gfx {
 class Display;
 class FontList;
 class Point;
 }  // namespace gfx
 
 namespace views {
 
@@ skipping 10 matching lines @@
   // has capture (with menus the first menu shown has capture). To enable this
   // if the NativeView that has capture has the same value for the property
   // |kGroupingPropertyKey| as the NativeView the mouse is over the tooltip is
   // shown.
   static const char kGroupingPropertyKey[];
 
   TooltipManager() {}
   virtual ~TooltipManager() {}
 
   // Returns the maximum width of the tooltip. |point| gives the location
-  // the tooltip is to be displayed on in screen coordinates. |context| is
-  // used to determine which gfx::Screen should be used.
-  virtual int GetMaxWidth(const gfx::Point& location,
-                          gfx::NativeView context) const = 0;
+  // the tooltip is to be displayed on in screen coordinates.
+  virtual int GetMaxWidth(const gfx::Point& location) const = 0;
 
   // Returns the font list used for tooltips.
   virtual const gfx::FontList& GetFontList() const = 0;
 
   // Notification that the view hierarchy has changed in some way.
   virtual void UpdateTooltip() = 0;
 
   // Invoked when the tooltip text changes for the specified views.
   virtual void TooltipTextChanged(View* view) = 0;
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WIDGET_TOOLTIP_MANAGER_H_