Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ui / views / corewm / tooltip_aura.h

diff --git a/src/ui/views/corewm/tooltip_aura.h b/src/ui/views/corewm/tooltip_aura.h
index 97f3737..07952b6 100644 (file)
--- a/src/ui/views/corewm/tooltip_aura.h
+++ b/src/ui/views/corewm/tooltip_aura.h
@@ -10,6 +10,10 @@
 #include "ui/views/corewm/tooltip.h"
 #include "ui/views/widget/widget_observer.h"
 
+namespace gfx {
+class FontList;
+}  // namespace gfx
+
 namespace views {
 
 class Widget;
@@ -20,15 +24,15 @@ namespace corewm {
 class VIEWS_EXPORT TooltipAura : public Tooltip, public WidgetObserver {
  public:
   explicit TooltipAura(gfx::ScreenType screen_type);
-  virtual ~TooltipAura();
+  ~TooltipAura() override;
 
   // Trims the tooltip to fit in the width |max_width|, setting |text| to the
   // clipped result, |width| to the width (in pixels) of the clipped text
-  // and |line_count| to the number of lines of text in the tooltip. |x| and |y|
-  // give the location of the tooltip in screen coordinates. |max_width| comes
-  // from GetMaxWidth().
-  static void TrimTooltipToFit(int max_width,
-                               string16* text,
+  // and |line_count| to the number of lines of text in the tooltip. |font_list|
+  // is used to layout |text|. |max_width| comes from GetMaxWidth().
+  static void TrimTooltipToFit(const gfx::FontList& font_list,
+                               int max_width,
+                               base::string16* text,
                                int* width,
                                int* line_count);
 
@@ -36,31 +40,24 @@ class VIEWS_EXPORT TooltipAura : public Tooltip, public WidgetObserver {
   // Returns the max width of the tooltip when shown at the specified location.
   int GetMaxWidth(const gfx::Point& location) const;
 
-  // Returns the bounds to fit the tooltip in.
-  gfx::Rect GetBoundsForTooltip(const gfx::Point& origin) const;
-
   // Adjusts the bounds given by the arguments to fit inside the desktop
   // and applies the adjusted bounds to the label_.
   void SetTooltipBounds(const gfx::Point& mouse_pos,
-                        int tooltip_width,
-                        int tooltip_height);
-
-  // Makes sure |widget_| is valid, creating as necessary.
-  void CreateWidget();
+                        const gfx::Size& tooltip_size);
 
   // Destroys |widget_|.
   void DestroyWidget();
 
   // Tooltip:
-  virtual void SetText(aura::Window* window,
-                       const string16& tooltip_text,
-                       const gfx::Point& location) OVERRIDE;
-  virtual void Show() OVERRIDE;
-  virtual void Hide() OVERRIDE;
-  virtual bool IsVisible() OVERRIDE;
+  void SetText(aura::Window* window,
+               const base::string16& tooltip_text,
+               const gfx::Point& location) override;
+  void Show() override;
+  void Hide() override;
+  bool IsVisible() override;
 
   // WidgetObserver:
-  virtual void OnWidgetDestroying(Widget* widget) OVERRIDE;
+  void OnWidgetDestroying(Widget* widget) override;
 
   const gfx::ScreenType screen_type_;