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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 8879016: Add more per-tab preferences. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Implemented preferences migration Created 9 years 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
« chrome/browser/ui/prefs/prefs_tab_helper_uitest.cc ('K') | « chrome/browser/ui/tab_contents/tab_contents_wrapper.h ('k') | chrome/browser/ui/webui/options/advanced_options_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/toolbar/encoding_menu_controller.cc
diff --git a/chrome/browser/ui/toolbar/encoding_menu_controller.cc b/chrome/browser/ui/toolbar/encoding_menu_controller.cc
index d28a4378214c5743c9d7cc8e46b1971622a29c1c..adf80e194d12af1171378980bc1a87535d75b400 100644
--- a/chrome/browser/ui/toolbar/encoding_menu_controller.cc
+++ b/chrome/browser/ui/toolbar/encoding_menu_controller.cc
@@ -85,8 +85,10 @@ bool EncodingMenuController::IsItemChecked(
return false;
std::string encoding = current_tab_encoding;
- if (encoding.empty())
- encoding = browser_profile->GetPrefs()->GetString(prefs::kDefaultCharset);
+ if (encoding.empty()) {
+ encoding =
+ browser_profile->GetPrefs()->GetString(prefs::kGlobalDefaultCharset);
+ }
if (item_id == IDC_ENCODING_AUTO_DETECT) {
return browser_profile->GetPrefs()->GetBoolean(
« chrome/browser/ui/prefs/prefs_tab_helper_uitest.cc ('K') | « chrome/browser/ui/tab_contents/tab_contents_wrapper.h ('k') | chrome/browser/ui/webui/options/advanced_options_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698