| OLD | NEW |
| 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 577 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 588 #endif | 588 #endif |
| 589 | 589 |
| 590 values->SetBoolean("cloudPrintShowMDnsOptions", | 590 values->SetBoolean("cloudPrintShowMDnsOptions", |
| 591 cloud_print_mdns_ui_enabled_); | 591 cloud_print_mdns_ui_enabled_); |
| 592 | 592 |
| 593 values->SetString("cloudPrintLearnMoreURL", chrome::kCloudPrintLearnMoreURL); | 593 values->SetString("cloudPrintLearnMoreURL", chrome::kCloudPrintLearnMoreURL); |
| 594 | 594 |
| 595 values->SetString("languagesLearnMoreURL", | 595 values->SetString("languagesLearnMoreURL", |
| 596 chrome::kLanguageSettingsLearnMoreUrl); | 596 chrome::kLanguageSettingsLearnMoreUrl); |
| 597 | 597 |
| 598 values->SetBoolean( | 598 values->SetBoolean("easyUnlockEnabled", easy_unlock::IsEnabled()); |
| 599 "easyUnlockEnabled", | |
| 600 CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableEasyUnlock)); | |
| 601 values->SetString("easyUnlockLearnMoreURL", chrome::kEasyUnlockLearnMoreUrl); | 599 values->SetString("easyUnlockLearnMoreURL", chrome::kEasyUnlockLearnMoreUrl); |
| 602 values->SetString("easyUnlockManagementURL", | 600 values->SetString("easyUnlockManagementURL", |
| 603 chrome::kEasyUnlockManagementUrl); | 601 chrome::kEasyUnlockManagementUrl); |
| 604 #if defined(OS_CHROMEOS) | 602 #if defined(OS_CHROMEOS) |
| 605 values->SetString("easyUnlockCheckboxLabel", | 603 values->SetString("easyUnlockCheckboxLabel", |
| 606 l10n_util::GetStringFUTF16( | 604 l10n_util::GetStringFUTF16( |
| 607 IDS_OPTIONS_EASY_UNLOCK_CHECKBOX_LABEL_CHROMEOS, | 605 IDS_OPTIONS_EASY_UNLOCK_CHECKBOX_LABEL_CHROMEOS, |
| 608 chromeos::GetChromeDeviceType())); | 606 chromeos::GetChromeDeviceType())); |
| 609 | 607 |
| 610 values->SetBoolean( | 608 values->SetBoolean( |
| (...skipping 1194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1805 extension = extensions::GetExtensionOverridingProxy( | 1803 extension = extensions::GetExtensionOverridingProxy( |
| 1806 Profile::FromWebUI(web_ui())); | 1804 Profile::FromWebUI(web_ui())); |
| 1807 AppendExtensionData("proxy", extension, &extension_controlled); | 1805 AppendExtensionData("proxy", extension, &extension_controlled); |
| 1808 | 1806 |
| 1809 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators", | 1807 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators", |
| 1810 extension_controlled); | 1808 extension_controlled); |
| 1811 #endif // defined(OS_WIN) | 1809 #endif // defined(OS_WIN) |
| 1812 } | 1810 } |
| 1813 | 1811 |
| 1814 } // namespace options | 1812 } // namespace options |
| OLD | NEW |