| 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 1964 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1975 web_prefs->password_echo_enabled = browser_defaults::kPasswordEchoEnabled; | 1975 web_prefs->password_echo_enabled = browser_defaults::kPasswordEchoEnabled; |
| 1976 #endif | 1976 #endif |
| 1977 | 1977 |
| 1978 #if defined(OS_CHROMEOS) | 1978 #if defined(OS_CHROMEOS) |
| 1979 // Enable password echo during OOBE when keyboard driven flag is set. | 1979 // Enable password echo during OOBE when keyboard driven flag is set. |
| 1980 if (chromeos::UserManager::IsInitialized() && | 1980 if (chromeos::UserManager::IsInitialized() && |
| 1981 !chromeos::UserManager::Get()->IsUserLoggedIn() && | 1981 !chromeos::UserManager::Get()->IsUserLoggedIn() && |
| 1982 !chromeos::StartupUtils::IsOobeCompleted()) { | 1982 !chromeos::StartupUtils::IsOobeCompleted()) { |
| 1983 bool keyboard_driven_oobe = false; | 1983 bool keyboard_driven_oobe = false; |
| 1984 chromeos::system::StatisticsProvider::GetInstance()->GetMachineFlag( | 1984 chromeos::system::StatisticsProvider::GetInstance()->GetMachineFlag( |
| 1985 chromeos::kOemKeyboardDrivenOobeKey, &keyboard_driven_oobe); | 1985 chromeos::system::kOemKeyboardDrivenOobeKey, &keyboard_driven_oobe); |
| 1986 if (keyboard_driven_oobe) | 1986 if (keyboard_driven_oobe) |
| 1987 web_prefs->password_echo_enabled = true; | 1987 web_prefs->password_echo_enabled = true; |
| 1988 } | 1988 } |
| 1989 #endif | 1989 #endif |
| 1990 | 1990 |
| 1991 #if defined(OS_ANDROID) | 1991 #if defined(OS_ANDROID) |
| 1992 web_prefs->user_style_sheet_enabled = false; | 1992 web_prefs->user_style_sheet_enabled = false; |
| 1993 #else | 1993 #else |
| 1994 // The user stylesheet watcher may not exist in a testing profile. | 1994 // The user stylesheet watcher may not exist in a testing profile. |
| 1995 UserStyleSheetWatcher* user_style_sheet_watcher = | 1995 UserStyleSheetWatcher* user_style_sheet_watcher = |
| (...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2341 #if defined(USE_NSS) | 2341 #if defined(USE_NSS) |
| 2342 crypto::CryptoModuleBlockingPasswordDelegate* | 2342 crypto::CryptoModuleBlockingPasswordDelegate* |
| 2343 ChromeContentBrowserClient::GetCryptoPasswordDelegate( | 2343 ChromeContentBrowserClient::GetCryptoPasswordDelegate( |
| 2344 const GURL& url) { | 2344 const GURL& url) { |
| 2345 return chrome::NewCryptoModuleBlockingDialogDelegate( | 2345 return chrome::NewCryptoModuleBlockingDialogDelegate( |
| 2346 chrome::kCryptoModulePasswordKeygen, url.host()); | 2346 chrome::kCryptoModulePasswordKeygen, url.host()); |
| 2347 } | 2347 } |
| 2348 #endif | 2348 #endif |
| 2349 | 2349 |
| 2350 } // namespace chrome | 2350 } // namespace chrome |
| OLD | NEW |