chrome/browser/password_manager/password_store_factory.cc - Issue 816403003: Make callers of CommandLine use it via the base:: namespace.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/password_manager/password_store_factory.cc

Issue 816403003: Make callers of CommandLine use it via the base:: namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix Created 6 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

« no previous file with comments | « chrome/browser/password_manager/password_manager_browsertest.cc ('k') | chrome/browser/plugins/chrome_content_browser_client_plugins_part.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/password_manager/password_store_factory.cc

diff --git a/chrome/browser/password_manager/password_store_factory.cc b/chrome/browser/password_manager/password_store_factory.cc

index 1577cdb5001a22836987315fc7390a52d839d084..cc2fa43c2985c94ef2264342e628f73671f51484 100644

--- a/chrome/browser/password_manager/password_store_factory.cc

+++ b/chrome/browser/password_manager/password_store_factory.cc

@@ -174,9 +174,10 @@ KeyedService* PasswordStoreFactory::BuildServiceInstanceFor(

profile, Profile::EXPLICIT_ACCESS));

#elif defined(OS_MACOSX)

crypto::AppleKeychain* keychain =

- CommandLine::ForCurrentProcess()->HasSwitch(

- os_crypt::switches::kUseMockKeychain) ?

- new crypto::MockAppleKeychain() : new crypto::AppleKeychain();

+ base::CommandLine::ForCurrentProcess()->HasSwitch(

+ os_crypt::switches::kUseMockKeychain)

+ ? new crypto::MockAppleKeychain()

+ : new crypto::AppleKeychain();

ps = new PasswordStoreMac(

main_thread_runner, db_thread_runner, keychain, login_db.release());

#elif defined(OS_CHROMEOS) || defined(OS_ANDROID)

@@ -190,7 +191,7 @@ KeyedService* PasswordStoreFactory::BuildServiceInstanceFor(

// (In all cases we fall back on the basic store in case of failure.)

base::nix::DesktopEnvironment desktop_env;

std::string store_type =

- CommandLine::ForCurrentProcess()->GetSwitchValueASCII(

+ base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(

switches::kPasswordStore);

if (store_type == "kwallet") {

desktop_env = base::nix::DESKTOP_ENVIRONMENT_KDE4;