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 "base/basictypes.h" | 10 #include "base/basictypes.h" |
(...skipping 471 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
482 option_partial->AppendInteger(ash::MAGNIFIER_PARTIAL); | 482 option_partial->AppendInteger(ash::MAGNIFIER_PARTIAL); |
483 option_partial->Append(new base::StringValue(l10n_util::GetStringUTF16( | 483 option_partial->Append(new base::StringValue(l10n_util::GetStringUTF16( |
484 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_PARTIAL))); | 484 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_PARTIAL))); |
485 magnifier_list->Append(option_partial.release()); | 485 magnifier_list->Append(option_partial.release()); |
486 | 486 |
487 values->Set("magnifierList", magnifier_list.release()); | 487 values->Set("magnifierList", magnifier_list.release()); |
488 | 488 |
489 // Sets flag of whether kiosk section should be enabled. | 489 // Sets flag of whether kiosk section should be enabled. |
490 values->SetBoolean( | 490 values->SetBoolean( |
491 "enableKioskSection", | 491 "enableKioskSection", |
| 492 CommandLine::ForCurrentProcess()->HasSwitch( |
| 493 chromeos::switches::kEnableKioskAppSettings) && |
492 !CommandLine::ForCurrentProcess()->HasSwitch( | 494 !CommandLine::ForCurrentProcess()->HasSwitch( |
493 chromeos::switches::kDisableAppMode) && | 495 chromeos::switches::kDisableAppMode) && |
494 (chromeos::UserManager::Get()->IsCurrentUserOwner() || | 496 (chromeos::UserManager::Get()->IsCurrentUserOwner() || |
495 !base::chromeos::IsRunningOnChromeOS())); | 497 !base::chromeos::IsRunningOnChromeOS())); |
496 #endif | 498 #endif |
497 | 499 |
498 #if defined(OS_MACOSX) | 500 #if defined(OS_MACOSX) |
499 values->SetString("macPasswordsWarning", | 501 values->SetString("macPasswordsWarning", |
500 l10n_util::GetStringUTF16(IDS_OPTIONS_PASSWORDS_MAC_WARNING)); | 502 l10n_util::GetStringUTF16(IDS_OPTIONS_PASSWORDS_MAC_WARNING)); |
501 values->SetBoolean("multiple_profiles", | 503 values->SetBoolean("multiple_profiles", |
(...skipping 1082 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1584 base::FundamentalValue disabled(profile_pref_registrar_.IsManaged() || | 1586 base::FundamentalValue disabled(profile_pref_registrar_.IsManaged() || |
1585 is_extension_controlled); | 1587 is_extension_controlled); |
1586 base::FundamentalValue extension_controlled(is_extension_controlled); | 1588 base::FundamentalValue extension_controlled(is_extension_controlled); |
1587 web_ui()->CallJavascriptFunction("BrowserOptions.setupProxySettingsSection", | 1589 web_ui()->CallJavascriptFunction("BrowserOptions.setupProxySettingsSection", |
1588 disabled, extension_controlled); | 1590 disabled, extension_controlled); |
1589 | 1591 |
1590 #endif // !defined(OS_CHROMEOS) | 1592 #endif // !defined(OS_CHROMEOS) |
1591 } | 1593 } |
1592 | 1594 |
1593 } // namespace options | 1595 } // namespace options |
OLD | NEW |