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

Unified Diff: chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc

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 | « chrome/browser/ui/tests/elide_url_unittest.cc ('k') | chrome/browser/ui/views/status_bubble_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
index 41421175661ee03e47ebf78fb7557f04aeb436c2..6aa01301c6d7bc2566daad75cfffe8d07a316ce0 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
@@ -33,6 +33,7 @@
#include "chrome/browser/ui/bookmarks/bookmark_utils.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/chrome_pages.h"
+#include "chrome/browser/ui/elide_url.h"
#include "chrome/browser/ui/omnibox/omnibox_popup_model.h"
#include "chrome/browser/ui/omnibox/omnibox_view.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ -611,8 +612,8 @@ base::string16 BookmarkBarView::CreateToolTipForURLAndTitle(
if (!title.empty()) {
base::string16 localized_title = title;
base::i18n::AdjustStringForLocaleDirection(&localized_title);
- result.append(gfx::ElideText(localized_title, tt_fonts, max_width,
- gfx::ELIDE_AT_END));
+ result.append(ElideText(localized_title, tt_fonts, max_width,
+ gfx::ELIDE_AT_END));
}
// Only show the URL if the url and title differ.
@@ -628,8 +629,7 @@ base::string16 BookmarkBarView::CreateToolTipForURLAndTitle(
// default.
std::string languages = profile->GetPrefs()->GetString(
prefs::kAcceptLanguages);
- base::string16 elided_url(
- gfx::ElideUrl(url, tt_fonts, max_width, languages));
+ base::string16 elided_url(ElideUrl(url, tt_fonts, max_width, languages));
elided_url = base::i18n::GetDisplayStringInLTRDirectionality(elided_url);
result.append(elided_url);
}
« no previous file with comments | « chrome/browser/ui/tests/elide_url_unittest.cc ('k') | chrome/browser/ui/views/status_bubble_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698