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

Side by Side Diff: chrome/browser/ui/webui/options/browser_options_handler.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:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/signin/easy_unlock.cc ('k') | no next file » | 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/ui/webui/options/browser_options_handler.h" 5 #include "chrome/browser/ui/webui/options/browser_options_handler.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "apps/app_window.h" 10 #include "apps/app_window.h"
(...skipping 579 matching lines...) Expand 10 before | Expand all | Expand 10 after
590 #endif 590 #endif
591 591
592 values->SetBoolean("cloudPrintShowMDnsOptions", 592 values->SetBoolean("cloudPrintShowMDnsOptions",
593 cloud_print_mdns_ui_enabled_); 593 cloud_print_mdns_ui_enabled_);
594 594
595 values->SetString("cloudPrintLearnMoreURL", chrome::kCloudPrintLearnMoreURL); 595 values->SetString("cloudPrintLearnMoreURL", chrome::kCloudPrintLearnMoreURL);
596 596
597 values->SetString("languagesLearnMoreURL", 597 values->SetString("languagesLearnMoreURL",
598 chrome::kLanguageSettingsLearnMoreUrl); 598 chrome::kLanguageSettingsLearnMoreUrl);
599 599
600 values->SetBoolean( 600 values->SetBoolean("easyUnlockEnabled", easy_unlock::IsEnabled());
601 "easyUnlockEnabled",
602 CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableEasyUnlock));
603 values->SetString("easyUnlockLearnMoreURL", chrome::kEasyUnlockLearnMoreUrl); 601 values->SetString("easyUnlockLearnMoreURL", chrome::kEasyUnlockLearnMoreUrl);
604 values->SetString("easyUnlockManagementURL", 602 values->SetString("easyUnlockManagementURL",
605 chrome::kEasyUnlockManagementUrl); 603 chrome::kEasyUnlockManagementUrl);
606 #if defined(OS_CHROMEOS) 604 #if defined(OS_CHROMEOS)
607 values->SetString("easyUnlockCheckboxLabel", 605 values->SetString("easyUnlockCheckboxLabel",
608 l10n_util::GetStringFUTF16( 606 l10n_util::GetStringFUTF16(
609 IDS_OPTIONS_EASY_UNLOCK_CHECKBOX_LABEL_CHROMEOS, 607 IDS_OPTIONS_EASY_UNLOCK_CHECKBOX_LABEL_CHROMEOS,
610 chromeos::GetChromeDeviceType())); 608 chromeos::GetChromeDeviceType()));
611 609
612 values->SetBoolean( 610 values->SetBoolean(
(...skipping 1202 matching lines...) Expand 10 before | Expand all | Expand 10 after
1815 extension = extensions::GetExtensionOverridingProxy( 1813 extension = extensions::GetExtensionOverridingProxy(
1816 Profile::FromWebUI(web_ui())); 1814 Profile::FromWebUI(web_ui()));
1817 AppendExtensionData("proxy", extension, &extension_controlled); 1815 AppendExtensionData("proxy", extension, &extension_controlled);
1818 1816
1819 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators", 1817 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators",
1820 extension_controlled); 1818 extension_controlled);
1821 #endif // defined(OS_WIN) 1819 #endif // defined(OS_WIN)
1822 } 1820 }
1823 1821
1824 } // namespace options 1822 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/signin/easy_unlock.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698