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

Unified Diff: ios/chrome/browser/application_context_impl.cc

Issue 1456783004: Remove configuration policy on iOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Clean up gyp and DEPS Created 5 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ios/chrome/browser/application_context_impl.h ('k') | ios/chrome/browser/net/ios_chrome_network_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/browser/application_context_impl.cc
diff --git a/ios/chrome/browser/application_context_impl.cc b/ios/chrome/browser/application_context_impl.cc
index c95a0afa21e7290641050925e207a5d887fd5d20..3d42d10d057abbd0fe55d0c1a6fe61ef1d439d92 100644
--- a/ios/chrome/browser/application_context_impl.cc
+++ b/ios/chrome/browser/application_context_impl.cc
@@ -35,13 +35,6 @@
#include "net/log/net_log_capture_mode.h"
#include "net/socket/client_socket_pool_manager.h"
-#if defined(ENABLE_CONFIGURATION_POLICY)
-#include "components/policy/core/browser/browser_policy_connector.h"
-#include "components/policy/core/common/policy_service.h"
-#else
-#include "components/policy/core/common/policy_service_stub.h"
-#endif
-
ApplicationContextImpl::ApplicationContextImpl(
base::SequencedTaskRunner* local_state_task_runner,
const base::CommandLine& command_line)
@@ -172,23 +165,6 @@ variations::VariationsService* ApplicationContextImpl::GetVariationsService() {
return ios::GetChromeBrowserProvider()->GetVariationsService();
}
-policy::BrowserPolicyConnector*
-ApplicationContextImpl::GetBrowserPolicyConnector() {
- DCHECK(thread_checker_.CalledOnValidThread());
- return ios::GetChromeBrowserProvider()->GetBrowserPolicyConnector();
-}
-
-policy::PolicyService* ApplicationContextImpl::GetPolicyService() {
- DCHECK(thread_checker_.CalledOnValidThread());
-#if defined(ENABLE_CONFIGURATION_POLICY)
- return GetBrowserPolicyConnector()->GetPolicyService();
-#else
- if (!policy_service_)
- policy_service_.reset(new policy::PolicyServiceStub);
- return policy_service_.get();
-#endif
-}
-
rappor::RapporService* ApplicationContextImpl::GetRapporService() {
DCHECK(thread_checker_.CalledOnValidThread());
return ios::GetChromeBrowserProvider()->GetRapporService();
@@ -221,9 +197,8 @@ void ApplicationContextImpl::CreateLocalState() {
// Register local state preferences.
RegisterLocalStatePrefs(pref_registry.get());
- local_state_ =
- ::CreateLocalState(local_state_path, local_state_task_runner_.get(),
- GetPolicyService(), pref_registry, false);
+ local_state_ = ::CreateLocalState(
+ local_state_path, local_state_task_runner_.get(), pref_registry, false);
const int max_per_proxy =
local_state_->GetInteger(ios::prefs::kMaxConnectionsPerProxy);
« no previous file with comments | « ios/chrome/browser/application_context_impl.h ('k') | ios/chrome/browser/net/ios_chrome_network_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698