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

Unified Diff: chrome/browser/ui/cocoa/status_bubble_mac.mm

Issue 23731010: Move text_elider to gfx. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update3 Created 7 years, 3 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/status_bubble_mac.mm
diff --git a/chrome/browser/ui/cocoa/status_bubble_mac.mm b/chrome/browser/ui/cocoa/status_bubble_mac.mm
index 05457974ff60fa972023b8e457e1e23f46d382c5..b5ec7429aed1f58f8bc7dd912289d6787ed71749 100644
--- a/chrome/browser/ui/cocoa/status_bubble_mac.mm
+++ b/chrome/browser/ui/cocoa/status_bubble_mac.mm
@@ -19,7 +19,7 @@
#import "third_party/GTM/AppKit/GTMNSBezierPath+RoundRect.h"
#import "third_party/GTM/AppKit/GTMNSColor+Luminance.h"
#include "ui/base/cocoa/window_size_constants.h"
-#include "ui/base/text/text_elider.h"
+#include "ui/gfx/text_elider.h"
#include "ui/gfx/font.h"
#include "ui/gfx/point.h"
@@ -154,7 +154,7 @@ void StatusBubbleMac::SetURL(const GURL& url, const std::string& languages) {
[font pointSize]);
string16 original_url_text = net::FormatUrl(url, languages);
- string16 status = ui::ElideUrl(url, font_chr, text_width, languages);
+ string16 status = gfx::ElideUrl(url, font_chr, text_width, languages);
SetText(status, true);
@@ -623,7 +623,7 @@ void StatusBubbleMac::ExpandBubble() {
NSFont* font = [[window_ contentView] font];
gfx::Font font_chr(base::SysNSStringToUTF8([font fontName]),
[font pointSize]);
- string16 expanded_url = ui::ElideUrl(
+ string16 expanded_url = gfx::ElideUrl(
url_, font_chr, max_bubble_width, languages_);
// Scale width from gfx::Font in view coordinates to window coordinates.

Powered by Google App Engine
This is Rietveld 408576698