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

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

Issue 15966004: cros: Move kiosk settings to extensions page. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase and remove temp flag Created 7 years, 6 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
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 "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 { "accessibilityScreenMagnifierPartial", 333 { "accessibilityScreenMagnifierPartial",
334 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_PARTIAL }, 334 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_PARTIAL },
335 { "accessibilitySpokenFeedback", 335 { "accessibilitySpokenFeedback",
336 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SPOKEN_FEEDBACK_DESCRIPTION }, 336 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SPOKEN_FEEDBACK_DESCRIPTION },
337 { "accessibilityTitle", 337 { "accessibilityTitle",
338 IDS_OPTIONS_SETTINGS_SECTION_TITLE_ACCESSIBILITY }, 338 IDS_OPTIONS_SETTINGS_SECTION_TITLE_ACCESSIBILITY },
339 { "accessibilityVirtualKeyboard", 339 { "accessibilityVirtualKeyboard",
340 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_VIRTUAL_KEYBOARD_DESCRIPTION }, 340 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_VIRTUAL_KEYBOARD_DESCRIPTION },
341 { "accessibilityAlwaysShowMenu", 341 { "accessibilityAlwaysShowMenu",
342 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SHOULD_ALWAYS_SHOW_MENU }, 342 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SHOULD_ALWAYS_SHOW_MENU },
343 { "advancedSectionTitleKiosk", IDS_OPTIONS_KIOSK },
344 { "factoryResetHeading", IDS_OPTIONS_FACTORY_RESET_HEADING }, 343 { "factoryResetHeading", IDS_OPTIONS_FACTORY_RESET_HEADING },
345 { "factoryResetTitle", IDS_OPTIONS_FACTORY_RESET }, 344 { "factoryResetTitle", IDS_OPTIONS_FACTORY_RESET },
346 { "factoryResetRestart", IDS_OPTIONS_FACTORY_RESET_BUTTON }, 345 { "factoryResetRestart", IDS_OPTIONS_FACTORY_RESET_BUTTON },
347 { "factoryResetDataRestart", IDS_RELAUNCH_BUTTON }, 346 { "factoryResetDataRestart", IDS_RELAUNCH_BUTTON },
348 { "factoryResetWarning", IDS_OPTIONS_FACTORY_RESET_WARNING }, 347 { "factoryResetWarning", IDS_OPTIONS_FACTORY_RESET_WARNING },
349 { "factoryResetHelpUrl", IDS_FACTORY_RESET_HELP_URL }, 348 { "factoryResetHelpUrl", IDS_FACTORY_RESET_HELP_URL },
350 { "changePicture", IDS_OPTIONS_CHANGE_PICTURE_CAPTION }, 349 { "changePicture", IDS_OPTIONS_CHANGE_PICTURE_CAPTION },
351 { "datetimeTitle", IDS_OPTIONS_SETTINGS_SECTION_TITLE_DATETIME }, 350 { "datetimeTitle", IDS_OPTIONS_SETTINGS_SECTION_TITLE_DATETIME },
352 { "deviceGroupDescription", IDS_OPTIONS_DEVICE_GROUP_DESCRIPTION }, 351 { "deviceGroupDescription", IDS_OPTIONS_DEVICE_GROUP_DESCRIPTION },
353 { "deviceGroupPointer", IDS_OPTIONS_DEVICE_GROUP_POINTER_SECTION }, 352 { "deviceGroupPointer", IDS_OPTIONS_DEVICE_GROUP_POINTER_SECTION },
354 { "mouseSpeed", IDS_OPTIONS_SETTINGS_MOUSE_SPEED_DESCRIPTION }, 353 { "mouseSpeed", IDS_OPTIONS_SETTINGS_MOUSE_SPEED_DESCRIPTION },
355 { "touchpadSpeed", IDS_OPTIONS_SETTINGS_TOUCHPAD_SPEED_DESCRIPTION }, 354 { "touchpadSpeed", IDS_OPTIONS_SETTINGS_TOUCHPAD_SPEED_DESCRIPTION },
356 { "enableScreenlock", IDS_OPTIONS_ENABLE_SCREENLOCKER_CHECKBOX }, 355 { "enableScreenlock", IDS_OPTIONS_ENABLE_SCREENLOCKER_CHECKBOX },
357 { "internetOptionsButtonTitle", IDS_OPTIONS_INTERNET_OPTIONS_BUTTON_TITLE }, 356 { "internetOptionsButtonTitle", IDS_OPTIONS_INTERNET_OPTIONS_BUTTON_TITLE },
358 { "keyboardSettingsButtonTitle", 357 { "keyboardSettingsButtonTitle",
359 IDS_OPTIONS_DEVICE_GROUP_KEYBOARD_SETTINGS_BUTTON_TITLE }, 358 IDS_OPTIONS_DEVICE_GROUP_KEYBOARD_SETTINGS_BUTTON_TITLE },
360 { "manageAccountsButtonTitle", IDS_OPTIONS_ACCOUNTS_BUTTON_TITLE }, 359 { "manageAccountsButtonTitle", IDS_OPTIONS_ACCOUNTS_BUTTON_TITLE },
361 { "manageKioskAppsButton", IDS_OPTIONS_KIOSK_MANAGE_BUTTON },
362 { "noPointingDevices", IDS_OPTIONS_NO_POINTING_DEVICES }, 360 { "noPointingDevices", IDS_OPTIONS_NO_POINTING_DEVICES },
363 { "sectionTitleDevice", IDS_OPTIONS_DEVICE_GROUP_NAME }, 361 { "sectionTitleDevice", IDS_OPTIONS_DEVICE_GROUP_NAME },
364 { "sectionTitleInternet", IDS_OPTIONS_INTERNET_OPTIONS_GROUP_LABEL }, 362 { "sectionTitleInternet", IDS_OPTIONS_INTERNET_OPTIONS_GROUP_LABEL },
365 { "syncOverview", IDS_SYNC_OVERVIEW }, 363 { "syncOverview", IDS_SYNC_OVERVIEW },
366 { "syncButtonTextStart", IDS_SYNC_SETUP_BUTTON_LABEL }, 364 { "syncButtonTextStart", IDS_SYNC_SETUP_BUTTON_LABEL },
367 { "timezone", IDS_OPTIONS_SETTINGS_TIMEZONE_DESCRIPTION }, 365 { "timezone", IDS_OPTIONS_SETTINGS_TIMEZONE_DESCRIPTION },
368 { "use24HourClock", IDS_OPTIONS_SETTINGS_USE_24HOUR_CLOCK_DESCRIPTION }, 366 { "use24HourClock", IDS_OPTIONS_SETTINGS_USE_24HOUR_CLOCK_DESCRIPTION },
369 #else 367 #else
370 { "cloudPrintConnectorEnabledManageButton", 368 { "cloudPrintConnectorEnabledManageButton",
371 IDS_OPTIONS_CLOUD_PRINT_CONNECTOR_ENABLED_MANAGE_BUTTON}, 369 IDS_OPTIONS_CLOUD_PRINT_CONNECTOR_ENABLED_MANAGE_BUTTON},
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
467 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_FULL)); 465 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_FULL));
468 magnifier_list->Append(option_full.release()); 466 magnifier_list->Append(option_full.release());
469 467
470 scoped_ptr<base::ListValue> option_partial(new base::ListValue); 468 scoped_ptr<base::ListValue> option_partial(new base::ListValue);
471 option_partial->AppendInteger(ash::MAGNIFIER_PARTIAL); 469 option_partial->AppendInteger(ash::MAGNIFIER_PARTIAL);
472 option_partial->Append(new base::StringValue(l10n_util::GetStringUTF16( 470 option_partial->Append(new base::StringValue(l10n_util::GetStringUTF16(
473 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_PARTIAL))); 471 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_PARTIAL)));
474 magnifier_list->Append(option_partial.release()); 472 magnifier_list->Append(option_partial.release());
475 473
476 values->Set("magnifierList", magnifier_list.release()); 474 values->Set("magnifierList", magnifier_list.release());
477
478 // Sets flag of whether kiosk section should be enabled.
479 values->SetBoolean(
480 "enableKioskSection",
481 CommandLine::ForCurrentProcess()->HasSwitch(
482 chromeos::switches::kEnableKioskAppSettings) &&
483 !CommandLine::ForCurrentProcess()->HasSwitch(
484 chromeos::switches::kDisableAppMode) &&
485 (chromeos::UserManager::Get()->IsCurrentUserOwner() ||
486 !base::chromeos::IsRunningOnChromeOS()));
487 #endif 475 #endif
488 476
489 #if defined(OS_MACOSX) 477 #if defined(OS_MACOSX)
490 values->SetString("macPasswordsWarning", 478 values->SetString("macPasswordsWarning",
491 l10n_util::GetStringUTF16(IDS_OPTIONS_PASSWORDS_MAC_WARNING)); 479 l10n_util::GetStringUTF16(IDS_OPTIONS_PASSWORDS_MAC_WARNING));
492 values->SetBoolean("multiple_profiles", 480 values->SetBoolean("multiple_profiles",
493 g_browser_process->profile_manager()->GetNumberOfProfiles() > 1); 481 g_browser_process->profile_manager()->GetNumberOfProfiles() > 1);
494 #endif 482 #endif
495 483
496 if (ShouldShowMultiProfilesUserList()) 484 if (ShouldShowMultiProfilesUserList())
(...skipping 1121 matching lines...) Expand 10 before | Expand all | Expand 10 after
1618 base::FundamentalValue disabled(profile_pref_registrar_.IsManaged() || 1606 base::FundamentalValue disabled(profile_pref_registrar_.IsManaged() ||
1619 is_extension_controlled); 1607 is_extension_controlled);
1620 base::FundamentalValue extension_controlled(is_extension_controlled); 1608 base::FundamentalValue extension_controlled(is_extension_controlled);
1621 web_ui()->CallJavascriptFunction("BrowserOptions.setupProxySettingsSection", 1609 web_ui()->CallJavascriptFunction("BrowserOptions.setupProxySettingsSection",
1622 disabled, extension_controlled); 1610 disabled, extension_controlled);
1623 1611
1624 #endif // !defined(OS_CHROMEOS) 1612 #endif // !defined(OS_CHROMEOS)
1625 } 1613 }
1626 1614
1627 } // namespace options 1615 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698