Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/signin/easy_unlock.h" | 5 #include "chrome/browser/signin/easy_unlock.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | |
| 8 #include "base/metrics/field_trial.h" | |
| 7 #include "base/values.h" | 9 #include "base/values.h" |
| 8 #include "chrome/browser/extensions/extension_service.h" | 10 #include "chrome/browser/extensions/extension_service.h" |
| 9 #include "chrome/browser/profiles/profile.h" | 11 #include "chrome/browser/profiles/profile.h" |
| 10 #include "chrome/browser/ui/extensions/application_launch.h" | 12 #include "chrome/browser/ui/extensions/application_launch.h" |
| 13 #include "chrome/common/chrome_switches.h" | |
| 11 #include "chrome/common/pref_names.h" | 14 #include "chrome/common/pref_names.h" |
| 12 #include "components/pref_registry/pref_registry_syncable.h" | 15 #include "components/pref_registry/pref_registry_syncable.h" |
| 13 #include "extensions/browser/extension_system.h" | 16 #include "extensions/browser/extension_system.h" |
| 14 | 17 |
| 15 namespace easy_unlock { | 18 namespace easy_unlock { |
| 16 | 19 |
| 17 void RegisterProfilePrefs( | 20 void RegisterProfilePrefs( |
| 18 user_prefs::PrefRegistrySyncable* registry) { | 21 user_prefs::PrefRegistrySyncable* registry) { |
| 19 registry->RegisterBooleanPref( | 22 registry->RegisterBooleanPref( |
| 20 prefs::kEasyUnlockEnabled, | 23 prefs::kEasyUnlockEnabled, |
| (...skipping 12 matching lines...) Expand all Loading... | |
| 33 void LaunchEasyUnlockSetup(Profile* profile) { | 36 void LaunchEasyUnlockSetup(Profile* profile) { |
| 34 ExtensionService* service = | 37 ExtensionService* service = |
| 35 extensions::ExtensionSystem::Get(profile)->extension_service(); | 38 extensions::ExtensionSystem::Get(profile)->extension_service(); |
| 36 const extensions::Extension* extension = | 39 const extensions::Extension* extension = |
| 37 service->GetExtensionById(extension_misc::kEasyUnlockAppId, false); | 40 service->GetExtensionById(extension_misc::kEasyUnlockAppId, false); |
| 38 | 41 |
| 39 OpenApplication(AppLaunchParams( | 42 OpenApplication(AppLaunchParams( |
| 40 profile, extension, extensions::LAUNCH_CONTAINER_WINDOW, NEW_WINDOW)); | 43 profile, extension, extensions::LAUNCH_CONTAINER_WINDOW, NEW_WINDOW)); |
| 41 } | 44 } |
| 42 | 45 |
| 46 bool IsEnabled() { | |
| 47 const std::string group_name = | |
| 48 base::FieldTrialList::FindFullName("EasyUnlock"); | |
|
Andrew T Wilson (Slow)
2014/07/24 09:50:25
Move this line down after the check for the comman
Alexei Svitkine (slow)
2014/07/24 14:10:26
That will not produce correct results per go/finch
xiyuan
2014/07/25 17:47:26
Done.
| |
| 49 if (base::CommandLine::ForCurrentProcess()->HasSwitch( | |
| 50 switches::kEnableEasyUnlock)) { | |
| 51 return true; | |
| 52 } | |
| 53 return group_name == "Enable"; | |
| 54 } | |
| 55 | |
| 43 } // namespace easy_unlock | 56 } // namespace easy_unlock |
| OLD | NEW |