Windows component build fix for aura.

ui/aura_shell/shell_tooltip_manager.cc

 // 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.
 
 #include "ui/aura_shell/shell_tooltip_manager.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/location.h"
@@ skipping 30 matching lines @@
 // FIXME: get cursor offset from actual cursor size.
 const int kCursorOffsetX = 10;
 const int kCursorOffsetY = 15;
 
 // Maximum number of characters we allow in a tooltip.
 const size_t kMaxTooltipLength = 1024;
 
 // Maximum number of lines we allow in the tooltip.
 const size_t kMaxLines = 6;
 
+gfx::Font GetDefaultFont() {
+  // TODO(varunjain): implementation duplicated in tooltip_manager_aura. Figure
+  // out a way to merge.
+  return ui::ResourceBundle::GetSharedInstance().GetFont(
+      ui::ResourceBundle::BaseFont);
+}
+
+int GetMaxWidth(int x, int y) {
+  // TODO(varunjain): implementation duplicated in tooltip_manager_aura. Figure
+  // out a way to merge.
+  gfx::Rect monitor_bounds =
+      gfx::Screen::GetMonitorAreaNearestPoint(gfx::Point(x, y));
+  return (monitor_bounds.width() + 1) / 2;
+}
+
 // Trims the tooltip to fit, setting |text| to the clipped result,
 // |max_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.
 void TrimTooltipToFit(string16* text,
                       int* max_width,
                       int* line_count,
                       int x,
                       int y) {
   *max_width = 0;
   *line_count = 0;
 
   // Clamp the tooltip length to kMaxTooltipLength so that we don't
   // accidentally DOS the user with a mega tooltip.
   if (text->length() > kMaxTooltipLength)
     *text = text->substr(0, kMaxTooltipLength);
 
   // Determine the available width for the tooltip.
-  int available_width = aura::TooltipClient::GetMaxWidth(x, y);
+  int available_width = GetMaxWidth(x, y);
 
   // Split the string into at most kMaxLines lines.
   std::vector<string16> lines;
   base::SplitString(*text, '\n', &lines);
   if (lines.size() > kMaxLines)
     lines.resize(kMaxLines);
   *line_count = static_cast<int>(lines.size());
 
   // Format each line to fit.
-  gfx::Font font = aura::TooltipClient::GetDefaultFont();
+  gfx::Font font = GetDefaultFont();
   string16 result;
   for (std::vector<string16>::iterator i = lines.begin(); i != lines.end();
        ++i) {
     string16 elided_text = ui::ElideText(*i, font, available_width, false);
     *max_width = std::max(*max_width, font.GetStringWidth(elided_text));
     if (!result.empty())
       result.push_back('\n');
     result.append(elided_text);
   }
   *text = result;
@@ skipping 182 matching lines @@
       string16 tooltip_text(tooltip_text_);
       gfx::Point widget_loc = curr_mouse_loc_;
       widget_loc = widget_loc.Add(tooltip_window_->GetScreenBounds().origin());
       tooltip_->SetText(tooltip_text, widget_loc);
       tooltip_->Show();
     }
   }
 }
 
 }  // namespace aura_shell
-
-namespace aura {
-
-// static
-gfx::Font TooltipClient::GetDefaultFont() {
-  return ui::ResourceBundle::GetSharedInstance().GetFont(
-      ui::ResourceBundle::BaseFont);
-}
-
-// static
-int TooltipClient::GetMaxWidth(int x, int y) {
-  gfx::Rect monitor_bounds =
-      gfx::Screen::GetMonitorAreaNearestPoint(gfx::Point(x, y));
-  return (monitor_bounds.width() + 1) / 2;
-}
-
-}  // namespace aura