diff options
| author | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-05 13:46:23 +0000 |
|---|---|---|
| committer | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-05 13:46:23 +0000 |
| commit | 45d0ef7f291e28657d2198c6c9dd8197ee543a66 (patch) | |
| tree | 84aaf7e95414adf7867f7cfa86c8927658cb0656 /chrome/browser/ui/toolbar | |
| parent | 2ad6a8d2023f51b9b521fc40594d3e7610eecad4 (diff) | |
| download | chromium_src-45d0ef7f291e28657d2198c6c9dd8197ee543a66.zip chromium_src-45d0ef7f291e28657d2198c6c9dd8197ee543a66.tar.gz chromium_src-45d0ef7f291e28657d2198c6c9dd8197ee543a66.tar.bz2 | |
Remove use of NavigationController from NavigationEntry so NavigationEntry can be used independently.
BUG=none
TEST=page titles in back/foward menu, tabs
Review URL: http://codereview.chromium.org/5976015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70506 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/toolbar')
| -rw-r--r-- | chrome/browser/ui/toolbar/back_forward_menu_model.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/ui/toolbar/back_forward_menu_model.cc b/chrome/browser/ui/toolbar/back_forward_menu_model.cc index 390dce0..9874ef9 100644 --- a/chrome/browser/ui/toolbar/back_forward_menu_model.cc +++ b/chrome/browser/ui/toolbar/back_forward_menu_model.cc @@ -14,7 +14,10 @@ #include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/tab_contents/tab_contents.h" +#include "chrome/browser/prefs/pref_service.h" +#include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" +#include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" @@ -77,7 +80,8 @@ string16 BackForwardMenuModel::GetLabelAt(int index) const { // super long. NavigationEntry* entry = GetNavigationEntry(index); string16 menu_text(entry->GetTitleForDisplay( - &GetTabContents()->controller())); + GetTabContents()->profile()->GetPrefs()-> + GetString(prefs::kAcceptLanguages))); menu_text = gfx::ElideText(menu_text, gfx::Font(), kMaxWidth, false); for (size_t i = menu_text.find('&'); i != string16::npos; |