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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 17010003: Cleanup of system settings constants (ab)use. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/chromeos/customization_document.cc » ('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/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 1969 matching lines...) Expand 10 before | Expand all | Expand 10 after
1980 web_prefs->password_echo_enabled = browser_defaults::kPasswordEchoEnabled; 1980 web_prefs->password_echo_enabled = browser_defaults::kPasswordEchoEnabled;
1981 #endif 1981 #endif
1982 1982
1983 #if defined(OS_CHROMEOS) 1983 #if defined(OS_CHROMEOS)
1984 // Enable password echo during OOBE when keyboard driven flag is set. 1984 // Enable password echo during OOBE when keyboard driven flag is set.
1985 if (chromeos::UserManager::IsInitialized() && 1985 if (chromeos::UserManager::IsInitialized() &&
1986 !chromeos::UserManager::Get()->IsUserLoggedIn() && 1986 !chromeos::UserManager::Get()->IsUserLoggedIn() &&
1987 !chromeos::StartupUtils::IsOobeCompleted()) { 1987 !chromeos::StartupUtils::IsOobeCompleted()) {
1988 bool keyboard_driven_oobe = false; 1988 bool keyboard_driven_oobe = false;
1989 chromeos::system::StatisticsProvider::GetInstance()->GetMachineFlag( 1989 chromeos::system::StatisticsProvider::GetInstance()->GetMachineFlag(
1990 chromeos::kOemKeyboardDrivenOobeKey, &keyboard_driven_oobe); 1990 chromeos::system::kOemKeyboardDrivenOobeKey, &keyboard_driven_oobe);
1991 if (keyboard_driven_oobe) 1991 if (keyboard_driven_oobe)
1992 web_prefs->password_echo_enabled = true; 1992 web_prefs->password_echo_enabled = true;
1993 } 1993 }
1994 #endif 1994 #endif
1995 1995
1996 #if defined(OS_ANDROID) 1996 #if defined(OS_ANDROID)
1997 web_prefs->user_style_sheet_enabled = false; 1997 web_prefs->user_style_sheet_enabled = false;
1998 #else 1998 #else
1999 // The user stylesheet watcher may not exist in a testing profile. 1999 // The user stylesheet watcher may not exist in a testing profile.
2000 UserStyleSheetWatcher* user_style_sheet_watcher = 2000 UserStyleSheetWatcher* user_style_sheet_watcher =
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after
2346 #if defined(USE_NSS) 2346 #if defined(USE_NSS)
2347 crypto::CryptoModuleBlockingPasswordDelegate* 2347 crypto::CryptoModuleBlockingPasswordDelegate*
2348 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 2348 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
2349 const GURL& url) { 2349 const GURL& url) {
2350 return chrome::NewCryptoModuleBlockingDialogDelegate( 2350 return chrome::NewCryptoModuleBlockingDialogDelegate(
2351 chrome::kCryptoModulePasswordKeygen, url.host()); 2351 chrome::kCryptoModulePasswordKeygen, url.host());
2352 } 2352 }
2353 #endif 2353 #endif
2354 2354
2355 } // namespace chrome 2355 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/customization_document.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698