Move TrimWhitespace to the base namespace.

ui/views/controls/styled_label.cc

 // Copyright 2013 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/views/controls/styled_label.h"
 
 #include <vector>
 
 #include "base/strings/string_util.h"
 #include "ui/gfx/font_list.h"
@@ skipping 79 matching lines @@
 }
 
 
 // StyledLabel ----------------------------------------------------------------
 
 StyledLabel::StyledLabel(const base::string16& text,
                          StyledLabelListener* listener)
     : listener_(listener),
       displayed_on_background_color_set_(false),
       auto_color_readability_enabled_(true) {
-  TrimWhitespace(text, TRIM_TRAILING, &text_);
+  base::TrimWhitespace(text, base::TRIM_TRAILING, &text_);
 }
 
 StyledLabel::~StyledLabel() {}
 
 void StyledLabel::SetText(const base::string16& text) {
   text_ = text;
   style_ranges_.clear();
   RemoveAllChildViews(true);
   PreferredSizeChanged();
 }
@@ skipping 84 matching lines @@
   int x = 0;
 
   base::string16 remaining_string = text_;
   StyleRanges::const_iterator current_range = style_ranges_.begin();
 
   // Iterate over the text, creating a bunch of labels and links and laying them
   // out in the appropriate positions.
   while (!remaining_string.empty()) {
     // Don't put whitespace at beginning of a line with an exception for the
     // first line (so the text's leading whitespace is respected).
-    if (x == 0 && line > 0)
-      TrimWhitespace(remaining_string, TRIM_LEADING, &remaining_string);
+    if (x == 0 && line > 0) {
+      base::TrimWhitespace(remaining_string, base::TRIM_LEADING,
+                           &remaining_string);
+    }
 
     gfx::Range range(gfx::Range::InvalidRange());
     if (current_range != style_ranges_.end())
       range = current_range->range;
 
     const size_t position = text_.size() - remaining_string.size();
 
     const gfx::Rect chunk_bounds(x, 0, width - x, 2 * line_height);
     std::vector<base::string16> substrings;
     gfx::FontList text_font_list = font_list_;
@@ skipping 13 matching lines @@
 
     DCHECK(!substrings.empty());
     base::string16 chunk = substrings[0];
     if (chunk.empty()) {
       // Nothing fits on this line. Start a new line.
       // If x is 0, first line may have leading whitespace that doesn't fit in a
       // single line, so try trimming those. Otherwise there is no room for
       // anything; abort.
       if (x == 0) {
         if (line == 0) {
-          TrimWhitespace(remaining_string, TRIM_LEADING, &remaining_string);
+          base::TrimWhitespace(remaining_string, base::TRIM_LEADING,
+                               &remaining_string);
           continue;
         }
         break;
       }
 
       x = 0;
       line++;
       continue;
     }
 
@@ skipping 46 matching lines @@
     }
     x += view_size.width() - focus_border_insets.width();
 
     remaining_string = remaining_string.substr(chunk.size());
   }
 
   return gfx::Size(width, (line + 1) * line_height + GetInsets().height());
 }
 
 }  // namespace views