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

Unified Diff: chrome/browser/ui/toolbar/back_forward_menu_model.cc

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/toolbar/back_forward_menu_model.cc
===================================================================
--- chrome/browser/ui/toolbar/back_forward_menu_model.cc (revision 71854)
+++ chrome/browser/ui/toolbar/back_forward_menu_model.cc (working copy)
@@ -7,7 +7,6 @@
#include "chrome/browser/ui/toolbar/back_forward_menu_model.h"
#include "app/l10n_util.h"
-#include "app/text_elider.h"
#include "app/resource_bundle.h"
#include "base/string_number_conversions.h"
#include "chrome/browser/metrics/user_metrics.h"
@@ -22,6 +21,7 @@
#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
#include "net/base/registry_controlled_domain.h"
+#include "ui/base/text/text_elider.h"
const int BackForwardMenuModel::kMaxHistoryItems = 12;
const int BackForwardMenuModel::kMaxChapterStops = 5;
@@ -82,7 +82,7 @@
string16 menu_text(entry->GetTitleForDisplay(
GetTabContents()->profile()->GetPrefs()->
GetString(prefs::kAcceptLanguages)));
- menu_text = gfx::ElideText(menu_text, gfx::Font(), kMaxWidth, false);
+ menu_text = ui::ElideText(menu_text, gfx::Font(), kMaxWidth, false);
for (size_t i = menu_text.find('&'); i != string16::npos;
i = menu_text.find('&', i + 2)) {
« no previous file with comments | « chrome/browser/ui/login/login_prompt_gtk.cc ('k') | chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698