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

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: Update after review. Created 5 years, 12 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 23 matching lines...) Expand all
34 #if !defined(OS_IOS) 34 #if !defined(OS_IOS)
35 #include "chrome/browser/net/disk_cache_dir_policy_handler.h" 35 #include "chrome/browser/net/disk_cache_dir_policy_handler.h"
36 #include "chrome/browser/policy/file_selection_dialogs_policy_handler.h" 36 #include "chrome/browser/policy/file_selection_dialogs_policy_handler.h"
37 #include "chrome/browser/policy/javascript_policy_handler.h" 37 #include "chrome/browser/policy/javascript_policy_handler.h"
38 #include "chrome/browser/policy/network_prediction_policy_handler.h" 38 #include "chrome/browser/policy/network_prediction_policy_handler.h"
39 #include "chrome/browser/sessions/restore_on_startup_policy_handler.h" 39 #include "chrome/browser/sessions/restore_on_startup_policy_handler.h"
40 #include "chrome/browser/sync/sync_policy_handler.h" 40 #include "chrome/browser/sync/sync_policy_handler.h"
41 #endif 41 #endif
42 42
43 #if defined(OS_CHROMEOS) 43 #if defined(OS_CHROMEOS)
44 #include "chrome/browser/chromeos/net/captive_portal_ignore_proxy_policy_values. h"
44 #include "chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.h " 45 #include "chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.h "
45 #include "chromeos/dbus/power_policy_controller.h" 46 #include "chromeos/dbus/power_policy_controller.h"
46 #include "components/user_manager/user.h" 47 #include "components/user_manager/user.h"
47 #include "components/user_manager/user_manager.h" 48 #include "components/user_manager/user_manager.h"
48 #include "ui/chromeos/accessibility_types.h" 49 #include "ui/chromeos/accessibility_types.h"
49 #endif 50 #endif
50 51
51 #if !defined(OS_ANDROID) && !defined(OS_IOS) 52 #if !defined(OS_ANDROID) && !defined(OS_IOS)
52 #include "chrome/browser/download/download_dir_policy_handler.h" 53 #include "chrome/browser/download/download_dir_policy_handler.h"
53 #endif 54 #endif
(...skipping 758 matching lines...) Expand 10 before | Expand all | Expand 10 after
812 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( 813 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>(
813 new ExternalDataPolicyHandler(key::kWallpaperImage))); 814 new ExternalDataPolicyHandler(key::kWallpaperImage)));
814 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( 815 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>(
815 new SimpleSchemaValidatingPolicyHandler( 816 new SimpleSchemaValidatingPolicyHandler(
816 key::kSessionLocales, 817 key::kSessionLocales,
817 NULL, 818 NULL,
818 chrome_schema, 819 chrome_schema,
819 SCHEMA_STRICT, 820 SCHEMA_STRICT,
820 SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED, 821 SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED,
821 SimpleSchemaValidatingPolicyHandler::MANDATORY_PROHIBITED))); 822 SimpleSchemaValidatingPolicyHandler::MANDATORY_PROHIBITED)));
823 handlers->AddHandler(
824 make_scoped_ptr<ConfigurationPolicyHandler>(new IntRangePolicyHandler(
825 key::kCaptivePortalAuthenticationIgnoresProxy,
826 prefs::kCaptivePortalAuthenticationIgnoresProxy,
827 chromeos::CAPTIVE_PORTAL_AUTH_IGNORE_PROXY_FALSE,
828 chromeos::CAPTIVE_PORTAL_AUTH_IGNORE_PROXY_USER_CONFIGURABLE,
829 false)));
822 #endif // defined(OS_CHROMEOS) 830 #endif // defined(OS_CHROMEOS)
823 831
824 return handlers.Pass(); 832 return handlers.Pass();
825 } 833 }
826 834
827 } // namespace policy 835 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698