Move a bunch of random other files to src/ui/base...

chrome/browser/ui/views/download_item_view.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 "chrome/browser/ui/views/download_item_view.h"
 
 #include <vector>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
-#include "app/text_elider.h"
 #include "base/callback.h"
 #include "base/file_path.h"
 #include "base/i18n/rtl.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/themes/browser_theme_provider.h"
 #include "chrome/browser/ui/views/download_shelf_view.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/color_utils.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/animation/slide_animation.h"
+#include "ui/base/text/text_elider.h"
 #include "views/controls/button/native_button.h"
 #include "views/controls/menu/menu_2.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 
 using base::TimeDelta;
 
 // TODO(paulg): These may need to be adjusted when download progress
 //              animation is added, and also possibly to take into account
 //              different screen resolutions.
@@ skipping 234 matching lines @@
 #if defined(OS_LINUX)
     std::wstring rootname =
         base::SysNativeMBToWide(filename.RemoveExtension().value());
 #else
     std::wstring rootname = filename.RemoveExtension().value();
 #endif
 
     // Elide giant extensions (this shouldn't currently be hit, but might
     // in future, should we ever notice unsafe giant extensions).
     if (extension.length() > kFileNameMaxLength / 2)
-      gfx::ElideString(extension, kFileNameMaxLength / 2, &extension);
+      ui::ElideString(extension, kFileNameMaxLength / 2, &extension);
 
     // The dangerous download label text is different for an extension file.
     if (download->is_extension_install()) {
       dangerous_download_label_ = new views::Label(UTF16ToWide(
           l10n_util::GetStringUTF16(IDS_PROMPT_DANGEROUS_DOWNLOAD_EXTENSION)));
     } else {
-      gfx::ElideString(rootname,
-                       kFileNameMaxLength - extension.length(),
-                       &rootname);
+      ui::ElideString(rootname,
+                      kFileNameMaxLength - extension.length(),
+                      &rootname);
       std::wstring filename = rootname + L"." + extension;
       filename = UTF16ToWide(base::i18n::GetDisplayStringInLTRDirectionality(
           WideToUTF16(filename)));
       dangerous_download_label_ = new views::Label(UTF16ToWide(
           l10n_util::GetStringFUTF16(IDS_PROMPT_DANGEROUS_DOWNLOAD,
                                      WideToUTF16(filename))));
     }
     dangerous_download_label_->SetMultiLine(true);
     dangerous_download_label_->SetHorizontalAlignment(
         views::Label::ALIGN_LEFT);
@@ skipping 299 matching lines @@
   // Consequently, the x-axis of following canvas->DrawXXX() method should be
   // mirrored so the text and images are down in the right positions.
   canvas->Restore();
 
   // Print the text, left aligned and always print the file extension.
   // Last value of x was the end of the right image, just before the button.
   // Note that in dangerous mode we use a label (as the text is multi-line).
   if (!IsDangerousMode()) {
     string16 filename;
     if (!disabled_while_opening_) {
-      filename = gfx::ElideFilename(download_->GetFileNameToReportUser(),
-                                    font_, kTextWidth);
+      filename = ui::ElideFilename(download_->GetFileNameToReportUser(),
+                                   font_, kTextWidth);
     } else {
       // First, Calculate the download status opening string width.
       string16 status_string =
           l10n_util::GetStringFUTF16(IDS_DOWNLOAD_STATUS_OPENING, string16());
       int status_string_width = font_.GetStringWidth(status_string);
       // Then, elide the file name.
       string16 filename_string =
           gfx::ElideFilename(download_->GetFileNameToReportUser(), font_,
                              kTextWidth - status_string_width);
       // Last, concat the whole string.
@@ skipping 450 matching lines @@
 
   // If the name has changed, call SetAccessibleName and notify
   // assistive technology that the name has changed so they can
   // announce it immediately.
   if (new_name != current_name) {
     SetAccessibleName(new_name);
     if (GetWidget())
       NotifyAccessibilityEvent(AccessibilityTypes::EVENT_NAME_CHANGED);
   }
 }