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

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

Issue 143463006: Remove net dependency from ui/gfx (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add gurl include to elide_url_unittest.cc Created 6 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 | « build/android/pylib/gtest/filter/ui_unittests_disabled ('k') | chrome/browser/ui/elide_url.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 06ea02373e5633ccc2c88211e41850345fc304c7..e0eb140f3bc40accc6d915af9a6817876c0edde1 100644
--- a/chrome/browser/ui/cocoa/status_bubble_mac.mm
+++ b/chrome/browser/ui/cocoa/status_bubble_mac.mm
@@ -14,6 +14,7 @@
#include "base/strings/sys_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#import "chrome/browser/ui/cocoa/bubble_view.h"
+#include "chrome/browser/ui/elide_url.h"
#include "net/base/net_util.h"
#import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h"
#import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSBezierPath+RoundRect.h"
@@ -156,7 +157,7 @@ void StatusBubbleMac::SetURL(const GURL& url, const std::string& languages) {
base::string16 original_url_text = net::FormatUrl(url, languages);
base::string16 status =
- gfx::ElideUrl(url, font_list_chr, text_width, languages);
+ ElideUrl(url, font_list_chr, text_width, languages);
SetText(status, true);
@@ -625,7 +626,7 @@ void StatusBubbleMac::ExpandBubble() {
NSFont* font = [[window_ contentView] font];
gfx::FontList font_list_chr(
gfx::Font(base::SysNSStringToUTF8([font fontName]), [font pointSize]));
- base::string16 expanded_url = gfx::ElideUrl(
+ base::string16 expanded_url = ElideUrl(
url_, font_list_chr, max_bubble_width, languages_);
// Scale width from gfx::Font in view coordinates to window coordinates.
« no previous file with comments | « build/android/pylib/gtest/filter/ui_unittests_disabled ('k') | chrome/browser/ui/elide_url.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698