Move Range code to gfx.

ash/system/user/tray_user.cc

 // Copyright (c) 2012 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 "ash/system/user/tray_user.h"
 
 #include <algorithm>
 #include <climits>
 #include <vector>
 
@@ skipping 19 matching lines @@
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/aura/window.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/range/range.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/text/text_elider.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/insets.h"
+#include "ui/gfx/range/range.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/render_text.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/views/border.h"
 #include "ui/views/bubble/tray_bubble_view.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/custom_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
@@ skipping 391 matching lines @@
   if (contents_area.IsEmpty())
     return;
 
   // Word-wrap the label text.
   const gfx::Font font;
   std::vector<base::string16> lines;
   ui::ElideRectangleText(text_, font, contents_area.width(),
                          contents_area.height(), ui::ELIDE_LONG_WORDS, &lines);
   // Loop through the lines, creating a renderer for each.
   gfx::Point position = contents_area.origin();
-  ui::Range display_name(ui::Range::InvalidRange());
+  gfx::Range display_name(gfx::Range::InvalidRange());
   for (std::vector<base::string16>::const_iterator it = lines.begin();
        it != lines.end(); ++it) {
     gfx::RenderText* line = gfx::RenderText::CreateInstance();
     line->SetDirectionalityMode(gfx::DIRECTIONALITY_FROM_UI);
     line->SetText(*it);
     const gfx::Size size(contents_area.width(), line->GetStringSize().height());
     line->SetDisplayRect(gfx::Rect(position, size));
     position.set_y(position.y() + size.height());
 
     // Set the default text color for the line.
     line->SetColor(kPublicAccountUserCardTextColor);
 
     // If a range of the line contains the user's display name, apply a custom
     // text color to it.
     if (display_name.is_empty())
       display_name.set_start(it->find(kDisplayNameMark));
     if (!display_name.is_empty()) {
       display_name.set_end(
           it->find(kDisplayNameMark, display_name.start() + 1));
-      ui::Range line_range(0, it->size());
+      gfx::Range line_range(0, it->size());
       line->ApplyColor(kPublicAccountUserCardNameColor,
                        display_name.Intersect(line_range));
       // Update the range for the next line.
       if (display_name.end() >= line_range.end())
         display_name.set_start(0);
       else
-        display_name = ui::Range::InvalidRange();
+        display_name = gfx::Range::InvalidRange();
     }
 
     lines_.push_back(line);
   }
 
   // Position the link after the label text, separated by a space. If it does
   // not fit onto the last line of the text, wrap the link onto its own line.
   const gfx::Size last_line_size = lines_.back()->GetStringSize();
   const int space_width = font.GetStringWidth(ASCIIToUTF16(" "));
   const gfx::Size link_size = learn_more_->GetPreferredSize();
@@ skipping 785 matching lines @@
       kUserIconLargeSize : kUserIconSize;
 
   avatar_->SetImage(
       ash::Shell::GetInstance()->session_state_delegate()->GetUserImage(
           multiprofile_index_),
       gfx::Size(icon_size, icon_size));
 }
 
 }  // namespace internal
 }  // namespace ash