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

Side by Side Diff: ios/chrome/browser/content_settings/host_content_settings_map_factory.cc

Issue 2078893002: Add callback list to PrefModelAssociator after sync data is loaded (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@migrate_domain_scoped_settings
Patch Set: Created 4 years, 5 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "ios/chrome/browser/content_settings/host_content_settings_map_factory. h" 5 #include "ios/chrome/browser/content_settings/host_content_settings_map_factory. h"
6 6
7 #include "base/memory/singleton.h" 7 #include "base/memory/singleton.h"
8 #include "components/content_settings/core/browser/host_content_settings_map.h" 8 #include "components/content_settings/core/browser/host_content_settings_map.h"
9 #include "components/keyed_service/ios/browser_state_dependency_manager.h" 9 #include "components/keyed_service/ios/browser_state_dependency_manager.h"
10 #include "components/prefs/pref_service.h" 10 #include "components/prefs/pref_service.h"
(...skipping 26 matching lines...) Expand all
37 web::BrowserState* context) const { 37 web::BrowserState* context) const {
38 ios::ChromeBrowserState* browser_state = 38 ios::ChromeBrowserState* browser_state =
39 ios::ChromeBrowserState::FromBrowserState(context); 39 ios::ChromeBrowserState::FromBrowserState(context);
40 if (browser_state->IsOffTheRecord()) { 40 if (browser_state->IsOffTheRecord()) {
41 // If off-the-record, retrieve the host content settings map of the parent 41 // If off-the-record, retrieve the host content settings map of the parent
42 // browser state to ensure the preferences have been migrated. 42 // browser state to ensure the preferences have been migrated.
43 GetForBrowserState(browser_state->GetOriginalChromeBrowserState()); 43 GetForBrowserState(browser_state->GetOriginalChromeBrowserState());
44 } 44 }
45 return make_scoped_refptr(new HostContentSettingsMap( 45 return make_scoped_refptr(new HostContentSettingsMap(
46 browser_state->GetPrefs(), browser_state->IsOffTheRecord(), 46 browser_state->GetPrefs(), browser_state->IsOffTheRecord(),
47 false /* guest_profile */)); 47 false /* guest_profile */, nullptr /* PrefServiceSyncable* */));
raymes 2016/06/29 03:50:01 nit: same here
lshang 2016/06/30 05:03:36 Same as above, don't need to address this after we
48 } 48 }
49 49
50 web::BrowserState* HostContentSettingsMapFactory::GetBrowserStateToUse( 50 web::BrowserState* HostContentSettingsMapFactory::GetBrowserStateToUse(
51 web::BrowserState* context) const { 51 web::BrowserState* context) const {
52 return GetBrowserStateOwnInstanceInIncognito(context); 52 return GetBrowserStateOwnInstanceInIncognito(context);
53 } 53 }
54 54
55 } // namespace ios 55 } // namespace ios
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698