Remove ui/gfx/screen_type_delegate.h

ui/views/widget/tooltip_manager_aura.h

Index: ui/views/widget/tooltip_manager_aura.h
diff --git a/ui/views/widget/tooltip_manager_aura.h b/ui/views/widget/tooltip_manager_aura.h
index 8d6bd9aff84b870041ec06cfe932bb7c5d816489..f2de7bb9915cae5177b573984d8fcb8d1a7a72d2 100644
--- a/ui/views/widget/tooltip_manager_aura.h
+++ b/ui/views/widget/tooltip_manager_aura.h
@@ -39,8 +39,7 @@ class TooltipManagerAura : public TooltipManager {
   static const gfx::FontList& GetDefaultFontList();
 
   // TooltipManager:
-  int GetMaxWidth(const gfx::Point& location,
-                  aura::Window* context) const override;
+  int GetMaxWidth(const gfx::Point& location) const override;
   const gfx::FontList& GetFontList() const override;
   void UpdateTooltip() override;
   void TooltipTextChanged(View* view) override;
@@ -52,7 +51,7 @@ class TooltipManagerAura : public TooltipManager {
                               aura::Window* root_window);
 
   // Returns the Window the tooltip text is installed on.
-  aura::Window* GetWindow();
+  aura::Window* GetWindow() const;

[oshima, 2016/01/19 20:44:31]

I believe this const is intentional (as it returns non const internal object)

[scottmg, 2016/01/19 21:55:58]

Undid that.

 
   Widget* widget_;
   base::string16 tooltip_text_;