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

Side by Side Diff: chrome/browser/policy/configuration_policy_handler_list_factory.cc

Issue 818433003: ChromeOS: Implement CaptivePortalAuthenticationIgnoresProxy policy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Tests fixed. Created 5 years, 9 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/policy/configuration_policy_handler_list_factory.h" 5 #include "chrome/browser/policy/configuration_policy_handler_list_factory.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/memory/scoped_vector.h" 9 #include "base/memory/scoped_vector.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 449 matching lines...) Expand 10 before | Expand all | Expand 10 after
460 base::Value::TYPE_STRING }, 460 base::Value::TYPE_STRING },
461 { key::kKeyboardDefaultToFunctionKeys, 461 { key::kKeyboardDefaultToFunctionKeys,
462 prefs::kLanguageSendFunctionKeys, 462 prefs::kLanguageSendFunctionKeys,
463 base::Value::TYPE_BOOLEAN }, 463 base::Value::TYPE_BOOLEAN },
464 { key::kTouchVirtualKeyboardEnabled, 464 { key::kTouchVirtualKeyboardEnabled,
465 prefs::kTouchVirtualKeyboardEnabled, 465 prefs::kTouchVirtualKeyboardEnabled,
466 base::Value::TYPE_BOOLEAN }, 466 base::Value::TYPE_BOOLEAN },
467 { key::kEasyUnlockAllowed, 467 { key::kEasyUnlockAllowed,
468 prefs::kEasyUnlockAllowed, 468 prefs::kEasyUnlockAllowed,
469 base::Value::TYPE_BOOLEAN }, 469 base::Value::TYPE_BOOLEAN },
470 { key::kCaptivePortalAuthenticationIgnoresProxy,
471 prefs::kCaptivePortalAuthenticationIgnoresProxy,
472 base::Value::TYPE_BOOLEAN },
470 #endif // defined(OS_CHROMEOS) 473 #endif // defined(OS_CHROMEOS)
471 474
472 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) 475 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
473 { key::kBackgroundModeEnabled, 476 { key::kBackgroundModeEnabled,
474 prefs::kBackgroundModeEnabled, 477 prefs::kBackgroundModeEnabled,
475 base::Value::TYPE_BOOLEAN }, 478 base::Value::TYPE_BOOLEAN },
476 #endif // !defined(OS_MACOSX) && !defined(OS_CHROMEOS) 479 #endif // !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
477 480
478 #if defined(OS_ANDROID) 481 #if defined(OS_ANDROID)
479 { key::kDataCompressionProxyEnabled, 482 { key::kDataCompressionProxyEnabled,
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after
791 chrome_schema, 794 chrome_schema,
792 SCHEMA_STRICT, 795 SCHEMA_STRICT,
793 SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED, 796 SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED,
794 SimpleSchemaValidatingPolicyHandler::MANDATORY_PROHIBITED))); 797 SimpleSchemaValidatingPolicyHandler::MANDATORY_PROHIBITED)));
795 #endif // defined(OS_CHROMEOS) 798 #endif // defined(OS_CHROMEOS)
796 799
797 return handlers.Pass(); 800 return handlers.Pass();
798 } 801 }
799 802
800 } // namespace policy 803 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/policy/cloud/cloud_policy_browsertest.cc ('k') | chrome/browser/resources/options/browser_options.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698