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

Side by Side Diff: chrome/browser/ui/webui/options/browser_options_handler.cc

Issue 234583003: Add a command line switch --enable-consumer-management. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 8 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
« no previous file with comments | « chrome/browser/ui/webui/options/browser_options_handler.h ('k') | chromeos/chromeos_switches.h » ('j') | 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 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 if (select_folder_dialog_.get()) 174 if (select_folder_dialog_.get())
175 select_folder_dialog_->ListenerDestroyed(); 175 select_folder_dialog_->ListenerDestroyed();
176 } 176 }
177 177
178 void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) { 178 void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
179 DCHECK(values); 179 DCHECK(values);
180 180
181 static OptionsStringResource resources[] = { 181 static OptionsStringResource resources[] = {
182 { "advancedSectionTitleCloudPrint", IDS_GOOGLE_CLOUD_PRINT }, 182 { "advancedSectionTitleCloudPrint", IDS_GOOGLE_CLOUD_PRINT },
183 { "currentUserOnly", IDS_OPTIONS_CURRENT_USER_ONLY }, 183 { "currentUserOnly", IDS_OPTIONS_CURRENT_USER_ONLY },
184 { "advancedSectionTitleCertificates",
185 IDS_OPTIONS_ADVANCED_SECTION_TITLE_CERTIFICATES },
184 { "advancedSectionTitleContent", 186 { "advancedSectionTitleContent",
185 IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT }, 187 IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT },
186 { "advancedSectionTitleLanguages", 188 { "advancedSectionTitleLanguages",
187 IDS_OPTIONS_ADVANCED_SECTION_TITLE_LANGUAGES }, 189 IDS_OPTIONS_ADVANCED_SECTION_TITLE_LANGUAGES },
188 { "advancedSectionTitleNetwork", 190 { "advancedSectionTitleNetwork",
189 IDS_OPTIONS_ADVANCED_SECTION_TITLE_NETWORK }, 191 IDS_OPTIONS_ADVANCED_SECTION_TITLE_NETWORK },
190 { "advancedSectionTitlePrivacy", 192 { "advancedSectionTitlePrivacy",
191 IDS_OPTIONS_ADVANCED_SECTION_TITLE_PRIVACY }, 193 IDS_OPTIONS_ADVANCED_SECTION_TITLE_PRIVACY },
192 { "advancedSectionTitleSecurity",
193 IDS_OPTIONS_ADVANCED_SECTION_TITLE_SECURITY },
194 { "autofillEnabled", IDS_OPTIONS_AUTOFILL_ENABLE }, 194 { "autofillEnabled", IDS_OPTIONS_AUTOFILL_ENABLE },
195 { "autologinEnabled", IDS_OPTIONS_PASSWORDS_AUTOLOGIN }, 195 { "autologinEnabled", IDS_OPTIONS_PASSWORDS_AUTOLOGIN },
196 { "autoOpenFileTypesInfo", IDS_OPTIONS_OPEN_FILE_TYPES_AUTOMATICALLY }, 196 { "autoOpenFileTypesInfo", IDS_OPTIONS_OPEN_FILE_TYPES_AUTOMATICALLY },
197 { "autoOpenFileTypesResetToDefault", 197 { "autoOpenFileTypesResetToDefault",
198 IDS_OPTIONS_AUTOOPENFILETYPES_RESETTODEFAULT }, 198 IDS_OPTIONS_AUTOOPENFILETYPES_RESETTODEFAULT },
199 { "changeHomePage", IDS_OPTIONS_CHANGE_HOME_PAGE }, 199 { "changeHomePage", IDS_OPTIONS_CHANGE_HOME_PAGE },
200 { "certificatesManageButton", IDS_OPTIONS_CERTIFICATES_MANAGE_BUTTON }, 200 { "certificatesManageButton", IDS_OPTIONS_CERTIFICATES_MANAGE_BUTTON },
201 { "customizeSync", IDS_OPTIONS_CUSTOMIZE_SYNC_BUTTON_LABEL }, 201 { "customizeSync", IDS_OPTIONS_CUSTOMIZE_SYNC_BUTTON_LABEL },
202 { "defaultFontSizeLabel", IDS_OPTIONS_DEFAULT_FONT_SIZE_LABEL }, 202 { "defaultFontSizeLabel", IDS_OPTIONS_DEFAULT_FONT_SIZE_LABEL },
203 { "defaultSearchManageEngines", IDS_OPTIONS_DEFAULTSEARCH_MANAGE_ENGINES }, 203 { "defaultSearchManageEngines", IDS_OPTIONS_DEFAULTSEARCH_MANAGE_ENGINES },
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 { "autoclickDelayExtremelyShort", 361 { "autoclickDelayExtremelyShort",
362 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_EXTREMELY_SHORT }, 362 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_EXTREMELY_SHORT },
363 { "autoclickDelayVeryShort", 363 { "autoclickDelayVeryShort",
364 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_VERY_SHORT }, 364 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_VERY_SHORT },
365 { "autoclickDelayShort", 365 { "autoclickDelayShort",
366 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_SHORT }, 366 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_SHORT },
367 { "autoclickDelayLong", 367 { "autoclickDelayLong",
368 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_LONG }, 368 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_LONG },
369 { "autoclickDelayVeryLong", 369 { "autoclickDelayVeryLong",
370 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_VERY_LONG }, 370 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_VERY_LONG },
371 { "consumerManagementEnrollButton",
372 IDS_OPTIONS_CONSUMER_MANAGEMENT_ENROLL_BUTTON },
373 { "consumerManagementEnrollDescription",
374 IDS_OPTIONS_CONSUMER_MANAGEMENT_ENROLL_DESCRIPTION },
371 { "enableContentProtectionAttestation", 375 { "enableContentProtectionAttestation",
372 IDS_OPTIONS_ENABLE_CONTENT_PROTECTION_ATTESTATION }, 376 IDS_OPTIONS_ENABLE_CONTENT_PROTECTION_ATTESTATION },
373 { "factoryResetHeading", IDS_OPTIONS_FACTORY_RESET_HEADING }, 377 { "factoryResetHeading", IDS_OPTIONS_FACTORY_RESET_HEADING },
374 { "factoryResetTitle", IDS_OPTIONS_FACTORY_RESET }, 378 { "factoryResetTitle", IDS_OPTIONS_FACTORY_RESET },
375 { "factoryResetRestart", IDS_OPTIONS_FACTORY_RESET_BUTTON }, 379 { "factoryResetRestart", IDS_OPTIONS_FACTORY_RESET_BUTTON },
376 { "factoryResetDataRestart", IDS_RELAUNCH_BUTTON }, 380 { "factoryResetDataRestart", IDS_RELAUNCH_BUTTON },
377 { "factoryResetWarning", IDS_OPTIONS_FACTORY_RESET_WARNING }, 381 { "factoryResetWarning", IDS_OPTIONS_FACTORY_RESET_WARNING },
378 { "factoryResetHelpUrl", IDS_FACTORY_RESET_HELP_URL }, 382 { "factoryResetHelpUrl", IDS_FACTORY_RESET_HELP_URL },
379 { "changePicture", IDS_OPTIONS_CHANGE_PICTURE }, 383 { "changePicture", IDS_OPTIONS_CHANGE_PICTURE },
380 { "changePictureCaption", IDS_OPTIONS_CHANGE_PICTURE_CAPTION }, 384 { "changePictureCaption", IDS_OPTIONS_CHANGE_PICTURE_CAPTION },
381 { "datetimeTitle", IDS_OPTIONS_SETTINGS_SECTION_TITLE_DATETIME }, 385 { "datetimeTitle", IDS_OPTIONS_SETTINGS_SECTION_TITLE_DATETIME },
382 { "deviceGroupDescription", IDS_OPTIONS_DEVICE_GROUP_DESCRIPTION }, 386 { "deviceGroupDescription", IDS_OPTIONS_DEVICE_GROUP_DESCRIPTION },
383 { "deviceGroupPointer", IDS_OPTIONS_DEVICE_GROUP_POINTER_SECTION }, 387 { "deviceGroupPointer", IDS_OPTIONS_DEVICE_GROUP_POINTER_SECTION },
384 { "mouseSpeed", IDS_OPTIONS_SETTINGS_MOUSE_SPEED_DESCRIPTION }, 388 { "mouseSpeed", IDS_OPTIONS_SETTINGS_MOUSE_SPEED_DESCRIPTION },
385 { "touchpadSpeed", IDS_OPTIONS_SETTINGS_TOUCHPAD_SPEED_DESCRIPTION }, 389 { "touchpadSpeed", IDS_OPTIONS_SETTINGS_TOUCHPAD_SPEED_DESCRIPTION },
386 { "enableScreenlock", IDS_OPTIONS_ENABLE_SCREENLOCKER_CHECKBOX }, 390 { "enableScreenlock", IDS_OPTIONS_ENABLE_SCREENLOCKER_CHECKBOX },
387 { "internetOptionsButtonTitle", IDS_OPTIONS_INTERNET_OPTIONS_BUTTON_TITLE }, 391 { "internetOptionsButtonTitle", IDS_OPTIONS_INTERNET_OPTIONS_BUTTON_TITLE },
388 { "keyboardSettingsButtonTitle", 392 { "keyboardSettingsButtonTitle",
389 IDS_OPTIONS_DEVICE_GROUP_KEYBOARD_SETTINGS_BUTTON_TITLE }, 393 IDS_OPTIONS_DEVICE_GROUP_KEYBOARD_SETTINGS_BUTTON_TITLE },
390 { "manageAccountsButtonTitle", IDS_OPTIONS_ACCOUNTS_BUTTON_TITLE }, 394 { "manageAccountsButtonTitle", IDS_OPTIONS_ACCOUNTS_BUTTON_TITLE },
391 { "noPointingDevices", IDS_OPTIONS_NO_POINTING_DEVICES }, 395 { "noPointingDevices", IDS_OPTIONS_NO_POINTING_DEVICES },
392 { "sectionTitleDevice", IDS_OPTIONS_DEVICE_GROUP_NAME }, 396 { "sectionTitleDevice", IDS_OPTIONS_DEVICE_GROUP_NAME },
393 { "sectionTitleInternet", IDS_OPTIONS_INTERNET_OPTIONS_GROUP_LABEL }, 397 { "sectionTitleInternet", IDS_OPTIONS_INTERNET_OPTIONS_GROUP_LABEL },
398 { "securityTitle", IDS_OPTIONS_SECURITY_SECTION_TITLE },
394 { "syncOverview", IDS_SYNC_OVERVIEW }, 399 { "syncOverview", IDS_SYNC_OVERVIEW },
395 { "syncButtonTextStart", IDS_SYNC_SETUP_BUTTON_LABEL }, 400 { "syncButtonTextStart", IDS_SYNC_SETUP_BUTTON_LABEL },
396 { "timezone", IDS_OPTIONS_SETTINGS_TIMEZONE_DESCRIPTION }, 401 { "timezone", IDS_OPTIONS_SETTINGS_TIMEZONE_DESCRIPTION },
397 { "use24HourClock", IDS_OPTIONS_SETTINGS_USE_24HOUR_CLOCK_DESCRIPTION }, 402 { "use24HourClock", IDS_OPTIONS_SETTINGS_USE_24HOUR_CLOCK_DESCRIPTION },
398 #else 403 #else
399 { "proxiesConfigureButton", IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON }, 404 { "proxiesConfigureButton", IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON },
400 #endif 405 #endif
401 #if defined(OS_CHROMEOS) && defined(USE_ASH) 406 #if defined(OS_CHROMEOS) && defined(USE_ASH)
402 { "setWallpaper", IDS_SET_WALLPAPER_BUTTON }, 407 { "setWallpaper", IDS_SET_WALLPAPER_BUTTON },
403 #endif 408 #endif
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
570 "easyUnlockEnabled", 575 "easyUnlockEnabled",
571 CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableEasyUnlock)); 576 CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableEasyUnlock));
572 values->SetString("easyUnlockLearnMoreURL", chrome::kEasyUnlockLearnMoreUrl); 577 values->SetString("easyUnlockLearnMoreURL", chrome::kEasyUnlockLearnMoreUrl);
573 values->SetString("easyUnlockManagementURL", 578 values->SetString("easyUnlockManagementURL",
574 chrome::kEasyUnlockManagementUrl); 579 chrome::kEasyUnlockManagementUrl);
575 #if defined(OS_CHROMEOS) 580 #if defined(OS_CHROMEOS)
576 values->SetString("easyUnlockCheckboxLabel", 581 values->SetString("easyUnlockCheckboxLabel",
577 l10n_util::GetStringFUTF16( 582 l10n_util::GetStringFUTF16(
578 IDS_OPTIONS_EASY_UNLOCK_CHECKBOX_LABEL_CHROMEOS, 583 IDS_OPTIONS_EASY_UNLOCK_CHECKBOX_LABEL_CHROMEOS,
579 chromeos::GetChromeDeviceType())); 584 chromeos::GetChromeDeviceType()));
585
586 values->SetBoolean(
587 "consumerManagementEnabled",
588 CommandLine::ForCurrentProcess()->HasSwitch(
589 chromeos::switches::kEnableConsumerManagement));
580 #endif 590 #endif
581 } 591 }
582 592
583 #if defined(ENABLE_FULL_PRINTING) 593 #if defined(ENABLE_FULL_PRINTING)
584 void BrowserOptionsHandler::RegisterCloudPrintValues( 594 void BrowserOptionsHandler::RegisterCloudPrintValues(
585 base::DictionaryValue* values) { 595 base::DictionaryValue* values) {
586 values->SetString("cloudPrintOptionLabel", 596 values->SetString("cloudPrintOptionLabel",
587 l10n_util::GetStringFUTF16( 597 l10n_util::GetStringFUTF16(
588 IDS_CLOUD_PRINT_CHROMEOS_OPTION_LABEL, 598 IDS_CLOUD_PRINT_CHROMEOS_OPTION_LABEL,
589 l10n_util::GetStringUTF16(IDS_GOOGLE_CLOUD_PRINT))); 599 l10n_util::GetStringUTF16(IDS_GOOGLE_CLOUD_PRINT)));
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
652 base::Bind(&BrowserOptionsHandler::VirtualKeyboardChangeCallback, 662 base::Bind(&BrowserOptionsHandler::VirtualKeyboardChangeCallback,
653 base::Unretained(this))); 663 base::Unretained(this)));
654 web_ui()->RegisterMessageCallback( 664 web_ui()->RegisterMessageCallback(
655 "onPowerwashDialogShow", 665 "onPowerwashDialogShow",
656 base::Bind(&BrowserOptionsHandler::OnPowerwashDialogShow, 666 base::Bind(&BrowserOptionsHandler::OnPowerwashDialogShow,
657 base::Unretained(this))); 667 base::Unretained(this)));
658 web_ui()->RegisterMessageCallback( 668 web_ui()->RegisterMessageCallback(
659 "performFactoryResetRestart", 669 "performFactoryResetRestart",
660 base::Bind(&BrowserOptionsHandler::PerformFactoryResetRestart, 670 base::Bind(&BrowserOptionsHandler::PerformFactoryResetRestart,
661 base::Unretained(this))); 671 base::Unretained(this)));
672 web_ui()->RegisterMessageCallback(
673 "enrollConsumerManagement",
674 base::Bind(&BrowserOptionsHandler::HandleEnrollConsumerManagement,
675 base::Unretained(this)));
662 #else 676 #else
663 web_ui()->RegisterMessageCallback( 677 web_ui()->RegisterMessageCallback(
664 "restartBrowser", 678 "restartBrowser",
665 base::Bind(&BrowserOptionsHandler::HandleRestartBrowser, 679 base::Bind(&BrowserOptionsHandler::HandleRestartBrowser,
666 base::Unretained(this))); 680 base::Unretained(this)));
667 web_ui()->RegisterMessageCallback( 681 web_ui()->RegisterMessageCallback(
668 "showNetworkProxySettings", 682 "showNetworkProxySettings",
669 base::Bind(&BrowserOptionsHandler::ShowNetworkProxySettings, 683 base::Bind(&BrowserOptionsHandler::ShowNetworkProxySettings,
670 base::Unretained(this))); 684 base::Unretained(this)));
671 #endif // defined(OS_CHROMEOS) 685 #endif // defined(OS_CHROMEOS)
(...skipping 869 matching lines...) Expand 10 before | Expand all | Expand 10 after
1541 1555
1542 PrefService* prefs = g_browser_process->local_state(); 1556 PrefService* prefs = g_browser_process->local_state();
1543 prefs->SetBoolean(prefs::kFactoryResetRequested, true); 1557 prefs->SetBoolean(prefs::kFactoryResetRequested, true);
1544 prefs->CommitPendingWrite(); 1558 prefs->CommitPendingWrite();
1545 1559
1546 // Perform sign out. Current chrome process will then terminate, new one will 1560 // Perform sign out. Current chrome process will then terminate, new one will
1547 // be launched (as if it was a restart). 1561 // be launched (as if it was a restart).
1548 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->RequestRestart(); 1562 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->RequestRestart();
1549 } 1563 }
1550 1564
1565 void BrowserOptionsHandler::HandleEnrollConsumerManagement(
1566 const base::ListValue* args) {
1567 // TODO(davidyu): Implement. http://crbug.com/353050.
1568 }
1569
1551 void BrowserOptionsHandler::SetupAccessibilityFeatures() { 1570 void BrowserOptionsHandler::SetupAccessibilityFeatures() {
1552 PrefService* pref_service = g_browser_process->local_state(); 1571 PrefService* pref_service = g_browser_process->local_state();
1553 base::FundamentalValue virtual_keyboard_enabled( 1572 base::FundamentalValue virtual_keyboard_enabled(
1554 pref_service->GetBoolean(prefs::kVirtualKeyboardEnabled)); 1573 pref_service->GetBoolean(prefs::kVirtualKeyboardEnabled));
1555 web_ui()->CallJavascriptFunction( 1574 web_ui()->CallJavascriptFunction(
1556 "BrowserOptions.setVirtualKeyboardCheckboxState", 1575 "BrowserOptions.setVirtualKeyboardCheckboxState",
1557 virtual_keyboard_enabled); 1576 virtual_keyboard_enabled);
1558 } 1577 }
1559 #endif 1578 #endif
1560 1579
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
1733 extension_name = base::StringValue( 1752 extension_name = base::StringValue(
1734 extension ? extension->name() : std::string()); 1753 extension ? extension->name() : std::string());
1735 web_ui()->CallJavascriptFunction( 1754 web_ui()->CallJavascriptFunction(
1736 "BrowserOptions.toggleStartupPagesControlled", 1755 "BrowserOptions.toggleStartupPagesControlled",
1737 extension_id, 1756 extension_id,
1738 extension_name); 1757 extension_name);
1739 } 1758 }
1740 #endif // defined(OS_WIN) 1759 #endif // defined(OS_WIN)
1741 1760
1742 } // namespace options 1761 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/browser_options_handler.h ('k') | chromeos/chromeos_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698