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

Side by Side Diff: chrome/browser/ui/prefs/prefs_tab_helper.cc

Issue 15937004: Respect Android system settings for allowing the last character of a password to be displayed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 7 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 unified diff | Download patch
« no previous file with comments | « chrome/browser/defaults.cc ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" 5 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/prefs/overlay_user_pref_store.h" 9 #include "base/prefs/overlay_user_pref_store.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 // The list of prefs we want to observe. 115 // The list of prefs we want to observe.
116 const char* kPrefsToObserve[] = { 116 const char* kPrefsToObserve[] = {
117 prefs::kDefaultCharset, 117 prefs::kDefaultCharset,
118 prefs::kWebKitAllowDisplayingInsecureContent, 118 prefs::kWebKitAllowDisplayingInsecureContent,
119 prefs::kWebKitAllowRunningInsecureContent, 119 prefs::kWebKitAllowRunningInsecureContent,
120 prefs::kWebKitDefaultFixedFontSize, 120 prefs::kWebKitDefaultFixedFontSize,
121 prefs::kWebKitDefaultFontSize, 121 prefs::kWebKitDefaultFontSize,
122 #if defined(OS_ANDROID) 122 #if defined(OS_ANDROID)
123 prefs::kWebKitFontScaleFactor, 123 prefs::kWebKitFontScaleFactor,
124 prefs::kWebKitForceEnableZoom, 124 prefs::kWebKitForceEnableZoom,
125 prefs::kWebKitPasswordEchoEnabled,
125 #endif 126 #endif
126 prefs::kWebKitJavascriptEnabled, 127 prefs::kWebKitJavascriptEnabled,
127 prefs::kWebKitJavaEnabled, 128 prefs::kWebKitJavaEnabled,
128 prefs::kWebKitLoadsImagesAutomatically, 129 prefs::kWebKitLoadsImagesAutomatically,
129 prefs::kWebKitMinimumFontSize, 130 prefs::kWebKitMinimumFontSize,
130 prefs::kWebKitMinimumLogicalFontSize, 131 prefs::kWebKitMinimumLogicalFontSize,
131 prefs::kWebKitPluginsEnabled, 132 prefs::kWebKitPluginsEnabled,
132 prefs::kWebkitTabsToLinks, 133 prefs::kWebkitTabsToLinks,
133 prefs::kWebKitUsesUniversalDetector 134 prefs::kWebKitUsesUniversalDetector
134 }; 135 };
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after
548 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 549 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
549 #if defined(OS_ANDROID) 550 #if defined(OS_ANDROID)
550 registry->RegisterDoublePref( 551 registry->RegisterDoublePref(
551 prefs::kWebKitFontScaleFactor, 552 prefs::kWebKitFontScaleFactor,
552 pref_defaults.font_scale_factor, 553 pref_defaults.font_scale_factor,
553 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 554 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
554 registry->RegisterBooleanPref( 555 registry->RegisterBooleanPref(
555 prefs::kWebKitForceEnableZoom, 556 prefs::kWebKitForceEnableZoom,
556 pref_defaults.force_enable_zoom, 557 pref_defaults.force_enable_zoom,
557 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 558 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
559 registry->RegisterBooleanPref(
560 prefs::kWebKitPasswordEchoEnabled,
561 pref_defaults.password_echo_enabled,
562 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
558 #endif 563 #endif
559 564
560 #if !defined(OS_MACOSX) 565 #if !defined(OS_MACOSX)
561 registry->RegisterLocalizedStringPref( 566 registry->RegisterLocalizedStringPref(
562 prefs::kAcceptLanguages, 567 prefs::kAcceptLanguages,
563 IDS_ACCEPT_LANGUAGES, 568 IDS_ACCEPT_LANGUAGES,
564 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 569 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
565 #else 570 #else
566 // Not used in OSX. 571 // Not used in OSX.
567 registry->RegisterLocalizedStringPref( 572 registry->RegisterLocalizedStringPref(
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
713 WebPreferences web_prefs = 718 WebPreferences web_prefs =
714 web_contents_->GetRenderViewHost()->GetWebkitPreferences(); 719 web_contents_->GetRenderViewHost()->GetWebkitPreferences();
715 OverrideFontFamily(&web_prefs, generic_family, script, std::string()); 720 OverrideFontFamily(&web_prefs, generic_family, script, std::string());
716 web_contents_->GetRenderViewHost()->UpdateWebkitPreferences(web_prefs); 721 web_contents_->GetRenderViewHost()->UpdateWebkitPreferences(web_prefs);
717 return; 722 return;
718 } 723 }
719 } 724 }
720 725
721 UpdateWebPreferences(); 726 UpdateWebPreferences();
722 } 727 }
OLDNEW
« no previous file with comments | « chrome/browser/defaults.cc ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698