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

Unified Diff: chrome/browser/ui/cocoa/download/download_item_controller.mm

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
Index: chrome/browser/ui/cocoa/download/download_item_controller.mm
===================================================================
--- chrome/browser/ui/cocoa/download/download_item_controller.mm (revision 71854)
+++ chrome/browser/ui/cocoa/download/download_item_controller.mm (working copy)
@@ -6,7 +6,6 @@
#include "app/l10n_util_mac.h"
#include "app/resource_bundle.h"
-#include "app/text_elider.h"
#include "base/mac/mac_util.h"
#include "base/metrics/histogram.h"
#include "base/string16.h"
@@ -27,6 +26,7 @@
#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
#include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
+#include "ui/base/text/text_elider.h"
namespace {
@@ -191,15 +191,15 @@
// Elide giant extensions.
if (extension.length() > kFileNameMaxLength / 2) {
std::wstring wide_extension;
- gfx::ElideString(UTF8ToWide(extension), kFileNameMaxLength / 2,
- &wide_extension);
+ ui::ElideString(UTF8ToWide(extension), kFileNameMaxLength / 2,
+ &wide_extension);
extension = WideToUTF8(wide_extension);
}
// Rebuild the filename.extension.
std::wstring rootname = UTF8ToWide(filename.RemoveExtension().value());
- gfx::ElideString(rootname, kFileNameMaxLength - extension.length(),
- &rootname);
+ ui::ElideString(rootname, kFileNameMaxLength - extension.length(),
+ &rootname);
std::string new_filename = WideToUTF8(rootname);
if (extension.length())
new_filename += std::string(".") + extension;
@@ -269,7 +269,7 @@
}
- (void)updateToolTip {
- string16 elidedFilename = gfx::ElideFilename(
+ string16 elidedFilename = ui::ElideFilename(
[self download]->GetFileNameToReportUser(),
gfx::Font(), kToolTipMaxWidth);
[progressView_ setToolTip:base::SysUTF16ToNSString(elidedFilename)];
« no previous file with comments | « chrome/browser/ui/cocoa/download/download_item_cell.mm ('k') | chrome/browser/ui/cocoa/external_protocol_dialog.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698