Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7830)

Unified Diff: chrome/browser/ui/gtk/download_item_gtk.cc

Issue 6257006: Move a bunch of random other files to src/ui/base... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/gtk/download_item_gtk.h ('k') | chrome/browser/ui/gtk/download_shelf_gtk.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/gtk/download_item_gtk.cc
===================================================================
--- chrome/browser/ui/gtk/download_item_gtk.cc (revision 71854)
+++ chrome/browser/ui/gtk/download_item_gtk.cc (working copy)
@@ -6,7 +6,6 @@
#include "app/l10n_util.h"
#include "app/resource_bundle.h"
-#include "app/text_elider.h"
#include "base/basictypes.h"
#include "base/callback.h"
#include "base/metrics/histogram.h"
@@ -35,6 +34,7 @@
#include "grit/theme_resources.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/base/animation/slide_animation.h"
+#include "ui/base/text/text_elider.h"
namespace {
@@ -519,7 +519,7 @@
}
void DownloadItemGtk::UpdateTooltip() {
- string16 elided_filename = gfx::ElideFilename(
+ string16 elided_filename = ui::ElideFilename(
get_download()->GetFileNameToReportUser(),
gfx::Font(), kTooltipMaxWidth);
gtk_widget_set_tooltip_text(body_.get(),
@@ -531,7 +531,7 @@
// use gfx::Font() to draw the text. This is why we need to add so
// much padding when we set the size request. We need to either use gfx::Font
// or somehow extend TextElider.
- string16 elided_filename = gfx::ElideFilename(
+ string16 elided_filename = ui::ElideFilename(
get_download()->GetFileNameToReportUser(),
gfx::Font(), kTextWidth);
@@ -582,7 +582,7 @@
dangerous_warning =
l10n_util::GetStringUTF16(IDS_PROMPT_DANGEROUS_DOWNLOAD_EXTENSION);
} else {
- string16 elided_filename = gfx::ElideFilename(
+ string16 elided_filename = ui::ElideFilename(
get_download()->target_name(), gfx::Font(), kTextWidth);
dangerous_warning =
« no previous file with comments | « chrome/browser/ui/gtk/download_item_gtk.h ('k') | chrome/browser/ui/gtk/download_shelf_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698