OLD | NEW |
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/chrome_content_browser_client.h" | 5 #include "chrome/browser/chrome_content_browser_client.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <utility> | 8 #include <utility> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 1927 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1938 #if defined(OS_ANDROID) | 1938 #if defined(OS_ANDROID) |
1939 web_prefs->font_scale_factor = | 1939 web_prefs->font_scale_factor = |
1940 static_cast<float>(prefs->GetDouble(prefs::kWebKitFontScaleFactor)); | 1940 static_cast<float>(prefs->GetDouble(prefs::kWebKitFontScaleFactor)); |
1941 web_prefs->force_enable_zoom = | 1941 web_prefs->force_enable_zoom = |
1942 prefs->GetBoolean(prefs::kWebKitForceEnableZoom); | 1942 prefs->GetBoolean(prefs::kWebKitForceEnableZoom); |
1943 #if defined(GOOGLE_TV) | 1943 #if defined(GOOGLE_TV) |
1944 web_prefs->user_gesture_required_for_media_playback = false; | 1944 web_prefs->user_gesture_required_for_media_playback = false; |
1945 #endif | 1945 #endif |
1946 #endif | 1946 #endif |
1947 | 1947 |
| 1948 #if defined(OS_ANDROID) |
| 1949 web_prefs->password_echo_enabled = |
| 1950 prefs->GetBoolean(prefs::kWebKitPasswordEchoEnabled); |
| 1951 #else |
1948 web_prefs->password_echo_enabled = browser_defaults::kPasswordEchoEnabled; | 1952 web_prefs->password_echo_enabled = browser_defaults::kPasswordEchoEnabled; |
| 1953 #endif |
| 1954 |
1949 #if defined(OS_CHROMEOS) | 1955 #if defined(OS_CHROMEOS) |
1950 // Enable password echo during OOBE when keyboard driven flag is set. | 1956 // Enable password echo during OOBE when keyboard driven flag is set. |
1951 if (chromeos::UserManager::IsInitialized() && | 1957 if (chromeos::UserManager::IsInitialized() && |
1952 !chromeos::UserManager::Get()->IsUserLoggedIn() && | 1958 !chromeos::UserManager::Get()->IsUserLoggedIn() && |
1953 !chromeos::StartupUtils::IsOobeCompleted()) { | 1959 !chromeos::StartupUtils::IsOobeCompleted()) { |
1954 bool keyboard_driven_oobe = false; | 1960 bool keyboard_driven_oobe = false; |
1955 chromeos::system::StatisticsProvider::GetInstance()->GetMachineFlag( | 1961 chromeos::system::StatisticsProvider::GetInstance()->GetMachineFlag( |
1956 chromeos::kOemKeyboardDrivenOobeKey, &keyboard_driven_oobe); | 1962 chromeos::kOemKeyboardDrivenOobeKey, &keyboard_driven_oobe); |
1957 if (keyboard_driven_oobe) | 1963 if (keyboard_driven_oobe) |
1958 web_prefs->password_echo_enabled = true; | 1964 web_prefs->password_echo_enabled = true; |
(...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2325 #if defined(USE_NSS) | 2331 #if defined(USE_NSS) |
2326 crypto::CryptoModuleBlockingPasswordDelegate* | 2332 crypto::CryptoModuleBlockingPasswordDelegate* |
2327 ChromeContentBrowserClient::GetCryptoPasswordDelegate( | 2333 ChromeContentBrowserClient::GetCryptoPasswordDelegate( |
2328 const GURL& url) { | 2334 const GURL& url) { |
2329 return chrome::NewCryptoModuleBlockingDialogDelegate( | 2335 return chrome::NewCryptoModuleBlockingDialogDelegate( |
2330 chrome::kCryptoModulePasswordKeygen, url.host()); | 2336 chrome::kCryptoModulePasswordKeygen, url.host()); |
2331 } | 2337 } |
2332 #endif | 2338 #endif |
2333 | 2339 |
2334 } // namespace chrome | 2340 } // namespace chrome |
OLD | NEW |