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

Unified Diff: chrome/browser/autocomplete/autocomplete_popup_view_mac.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/autocomplete/autocomplete_popup_view_mac.mm
===================================================================
--- chrome/browser/autocomplete/autocomplete_popup_view_mac.mm (revision 71854)
+++ chrome/browser/autocomplete/autocomplete_popup_view_mac.mm (working copy)
@@ -7,7 +7,6 @@
#include "chrome/browser/autocomplete/autocomplete_popup_view_mac.h"
#include "app/resource_bundle.h"
-#include "app/text_elider.h"
#include "base/stl_util-inl.h"
#include "base/sys_string_conversions.h"
#include "base/utf_string_conversions.h"
@@ -28,6 +27,7 @@
#include "skia/ext/skia_utils_mac.h"
#import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"
#import "third_party/GTM/AppKit/GTMNSBezierPath+RoundRect.h"
+#include "ui/base/text/text_elider.h"
namespace {
@@ -163,7 +163,7 @@
}
// If ElideText() decides to do nothing, nothing to be done.
- const std::wstring elided(UTF16ToWideHack(ElideText(
+ const std::wstring elided(UTF16ToWideHack(ui::ElideText(
WideToUTF16Hack(originalString), font, width, false)));
if (0 == elided.compare(originalString)) {
return aString;
@@ -209,8 +209,8 @@
// TODO(shess): Consider revising our NSCell subclass to have two
// bits and just draw them right, rather than truncating here.
const float textWidth = cellWidth - kTextXOffset;
- as = ElideString(as, match.contents, font,
- textWidth * kMaxContentsFraction);
+ as = ui::ElideString(as, match.contents, font,
+ textWidth * kMaxContentsFraction);
NSDictionary* attributes =
[NSDictionary dictionaryWithObjectsAndKeys:

Powered by Google App Engine
This is Rietveld 408576698