Remove ui/gfx/screen_type_delegate.h

ui/views/widget/tooltip_manager_aura.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_AURA_H_
 #define UI_VIEWS_WIDGET_TOOLTIP_MANAGER_AURA_H_
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/strings/string16.h"
@@ skipping 21 matching lines @@
   // If |source| has capture this finds the Widget under the mouse and invokes
   // UpdateTooltip() on it's TooltipManager. This is necessary as when capture
   // is held mouse events are only delivered to the Window that has capture even
   // though we may show tooltips for the Window under the mouse.
   static void UpdateTooltipManagerForCapture(Widget* source);
 
   // Returns the FontList used by all TooltipManagerAuras.
   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;
 
  private:
   View* GetViewUnderPoint(const gfx::Point& point);
   void UpdateTooltipForTarget(View* target,
                               const gfx::Point& point,
                               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_;
 
   DISALLOW_COPY_AND_ASSIGN(TooltipManagerAura);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WIDGET_TOOLTIP_MANAGER_AURA_H_