| OLD | NEW | 
|---|
| 1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 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/prefs/active_profile_pref_service.h" | 5 #include "chrome/browser/prefs/active_profile_pref_service.h" | 
| 6 | 6 | 
| 7 #include "chrome/browser/profiles/profile_manager.h" | 7 #include "chrome/browser/profiles/profile_manager.h" | 
| 8 #include "content/public/browser/browser_context.h" | 8 #include "content/public/browser/browser_context.h" | 
| 9 #include "mojo/public/cpp/bindings/interface_request.h" | 9 #include "mojo/public/cpp/bindings/interface_request.h" | 
| 10 #include "services/service_manager/public/cpp/connector.h" | 10 #include "services/service_manager/public/cpp/connector.h" | 
| 11 #include "services/service_manager/public/cpp/interface_registry.h" | 11 #include "services/service_manager/public/cpp/interface_registry.h" | 
| 12 | 12 | 
| 13 ActiveProfilePrefService::ActiveProfilePrefService() = default; | 13 ActiveProfilePrefService::ActiveProfilePrefService() = default; | 
| 14 | 14 | 
| 15 ActiveProfilePrefService::~ActiveProfilePrefService() = default; | 15 ActiveProfilePrefService::~ActiveProfilePrefService() = default; | 
| 16 | 16 | 
| 17 void ActiveProfilePrefService::Connect( | 17 void ActiveProfilePrefService::Connect( | 
| 18     prefs::mojom::PrefRegistryPtr pref_registry, | 18     prefs::mojom::PrefRegistryPtr pref_registry, | 
| 19     const ConnectCallback& callback) { | 19     const ConnectCallback& callback) { | 
| 20   auto* connector = content::BrowserContext::GetConnectorFor( | 20   auto* connector = content::BrowserContext::GetConnectorFor( | 
| 21       ProfileManager::GetActiveUserProfile()); | 21       ProfileManager::GetActiveUserProfile()); | 
| 22   connector->BindInterface(prefs::mojom::kPrefStoreServiceName, | 22   connector->BindInterface(prefs::mojom::kServiceName, &connector_ptr_); | 
| 23                            &connector_ptr_); |  | 
| 24   connector_ptr_.set_connection_error_handler(base::Bind( | 23   connector_ptr_.set_connection_error_handler(base::Bind( | 
| 25       &ActiveProfilePrefService::OnConnectError, base::Unretained(this))); | 24       &ActiveProfilePrefService::OnConnectError, base::Unretained(this))); | 
| 26   connector_ptr_->Connect(std::move(pref_registry), callback); | 25   connector_ptr_->Connect(std::move(pref_registry), callback); | 
| 27 } | 26 } | 
| 28 | 27 | 
| 29 void ActiveProfilePrefService::Create( | 28 void ActiveProfilePrefService::Create( | 
| 30     const service_manager::Identity& remote_identity, | 29     const service_manager::Identity& remote_identity, | 
| 31     prefs::mojom::PrefStoreConnectorRequest request) { | 30     prefs::mojom::PrefStoreConnectorRequest request) { | 
| 32   connector_bindings_.AddBinding(this, std::move(request)); | 31   connector_bindings_.AddBinding(this, std::move(request)); | 
| 33 } | 32 } | 
| (...skipping 13 matching lines...) Expand all  Loading... | 
| 47                  << " from connecting to the active profile's pref service."; | 46                  << " from connecting to the active profile's pref service."; | 
| 48     return false; | 47     return false; | 
| 49   } | 48   } | 
| 50   registry->AddInterface<prefs::mojom::PrefStoreConnector>(this); | 49   registry->AddInterface<prefs::mojom::PrefStoreConnector>(this); | 
| 51   return true; | 50   return true; | 
| 52 } | 51 } | 
| 53 | 52 | 
| 54 void ActiveProfilePrefService::OnConnectError() { | 53 void ActiveProfilePrefService::OnConnectError() { | 
| 55   connector_bindings_.CloseAllBindings(); | 54   connector_bindings_.CloseAllBindings(); | 
| 56 } | 55 } | 
| OLD | NEW | 
|---|