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

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: Fixed test and formatted browser_options.html. Created 5 years, 11 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 471 matching lines...) Expand 10 before | Expand all | Expand 10 after
482 base::Value::TYPE_STRING }, 482 base::Value::TYPE_STRING },
483 { key::kKeyboardDefaultToFunctionKeys, 483 { key::kKeyboardDefaultToFunctionKeys,
484 prefs::kLanguageSendFunctionKeys, 484 prefs::kLanguageSendFunctionKeys,
485 base::Value::TYPE_BOOLEAN }, 485 base::Value::TYPE_BOOLEAN },
486 { key::kTouchVirtualKeyboardEnabled, 486 { key::kTouchVirtualKeyboardEnabled,
487 prefs::kTouchVirtualKeyboardEnabled, 487 prefs::kTouchVirtualKeyboardEnabled,
488 base::Value::TYPE_BOOLEAN }, 488 base::Value::TYPE_BOOLEAN },
489 { key::kEasyUnlockAllowed, 489 { key::kEasyUnlockAllowed,
490 prefs::kEasyUnlockAllowed, 490 prefs::kEasyUnlockAllowed,
491 base::Value::TYPE_BOOLEAN }, 491 base::Value::TYPE_BOOLEAN },
492 { key::kCaptivePortalAuthenticationIgnoresProxy,
493 prefs::kCaptivePortalAuthenticationIgnoresProxy,
494 base::Value::TYPE_BOOLEAN },
492 #endif // defined(OS_CHROMEOS) 495 #endif // defined(OS_CHROMEOS)
493 496
494 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) 497 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
495 { key::kBackgroundModeEnabled, 498 { key::kBackgroundModeEnabled,
496 prefs::kBackgroundModeEnabled, 499 prefs::kBackgroundModeEnabled,
497 base::Value::TYPE_BOOLEAN }, 500 base::Value::TYPE_BOOLEAN },
498 #endif // !defined(OS_MACOSX) && !defined(OS_CHROMEOS) 501 #endif // !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
499 502
500 #if defined(OS_ANDROID) 503 #if defined(OS_ANDROID)
501 { key::kDataCompressionProxyEnabled, 504 { key::kDataCompressionProxyEnabled,
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
818 chrome_schema, 821 chrome_schema,
819 SCHEMA_STRICT, 822 SCHEMA_STRICT,
820 SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED, 823 SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED,
821 SimpleSchemaValidatingPolicyHandler::MANDATORY_PROHIBITED))); 824 SimpleSchemaValidatingPolicyHandler::MANDATORY_PROHIBITED)));
822 #endif // defined(OS_CHROMEOS) 825 #endif // defined(OS_CHROMEOS)
823 826
824 return handlers.Pass(); 827 return handlers.Pass();
825 } 828 }
826 829
827 } // namespace policy 830 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698