chrome/browser/extensions/component_loader.cc - Issue 410713002: Control easy unlock by a field trial.

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/extensions/component_loader.cc

Issue 410713002: Control easy unlock by a field trial. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase, add go/finch-and-flags comment Created 6 years, 5 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:

Index: chrome/browser/extensions/component_loader.cc

diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc

index 20d08009a2e3cbf2ce88a64753f6a7e87242f462..c05815a60ef294992172f500a87617a45c6cc42b 100644

--- a/chrome/browser/extensions/component_loader.cc

+++ b/chrome/browser/extensions/component_loader.cc

@@ -12,6 +12,7 @@

#include "base/metrics/field_trial.h"

#include "base/path_service.h"

#include "chrome/browser/extensions/extension_service.h"

+#include "chrome/browser/signin/easy_unlock.h"

#include "chrome/common/chrome_paths.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/chrome_version_info.h"

@@ -592,8 +593,7 @@ void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages(

AddNetworkSpeechSynthesisExtension();

#endif

- if (!skip_session_components &&

- command_line->HasSwitch(switches::kEnableEasyUnlock)) {

+ if (!skip_session_components && easy_unlock::IsEnabled()) {

if (command_line->HasSwitch(switches::kEasyUnlockAppPath)) {

base::FilePath easy_unlock_path(

command_line->GetSwitchValuePath(switches::kEasyUnlockAppPath));

« no previous file with comments | « no previous file | chrome/browser/signin/easy_unlock.h » ('j') | no next file with comments »