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

Side by Side Diff: chrome/browser/profiles/profile_impl.h

Issue 145053004: Let chrome_prefs handle Preferences initialization from master_preferences. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add test Created 6 years, 10 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 // This class gathers state related to a single user profile. 5 // This class gathers state related to a single user profile.
6 6
7 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IMPL_H_ 7 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IMPL_H_
8 #define CHROME_BROWSER_PROFILES_PROFILE_IMPL_H_ 8 #define CHROME_BROWSER_PROFILES_PROFILE_IMPL_H_
9 9
10 #include <string> 10 #include <string>
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 62
63 // Ensures that the preference hash store has been initialized for the profile 63 // Ensures that the preference hash store has been initialized for the profile
64 // at |profile_path|. 64 // at |profile_path|.
65 static void InitializePrefHashStoreIfRequired( 65 static void InitializePrefHashStoreIfRequired(
66 const base::FilePath& profile_path); 66 const base::FilePath& profile_path);
67 67
68 // Resets the contents of the preference hash store for the profile at 68 // Resets the contents of the preference hash store for the profile at
69 // |profile_path|. 69 // |profile_path|.
70 static void ResetPrefHashStore(const base::FilePath& profile_path); 70 static void ResetPrefHashStore(const base::FilePath& profile_path);
71 71
72 // Initializes the preferences for the profile at |profile_path| with the
73 // preference values in |master_prefs|. Returns true on success.
74 static bool InitializePrefsFromMasterPrefs(
75 const base::FilePath& profile_path,
76 const base::DictionaryValue& master_prefs);
77
72 // content::BrowserContext implementation: 78 // content::BrowserContext implementation:
73 virtual base::FilePath GetPath() const OVERRIDE; 79 virtual base::FilePath GetPath() const OVERRIDE;
74 virtual content::DownloadManagerDelegate* 80 virtual content::DownloadManagerDelegate*
75 GetDownloadManagerDelegate() OVERRIDE; 81 GetDownloadManagerDelegate() OVERRIDE;
76 virtual net::URLRequestContextGetter* GetRequestContext() OVERRIDE; 82 virtual net::URLRequestContextGetter* GetRequestContext() OVERRIDE;
77 virtual net::URLRequestContextGetter* GetRequestContextForRenderProcess( 83 virtual net::URLRequestContextGetter* GetRequestContextForRenderProcess(
78 int renderer_child_id) OVERRIDE; 84 int renderer_child_id) OVERRIDE;
79 virtual net::URLRequestContextGetter* GetMediaRequestContext() OVERRIDE; 85 virtual net::URLRequestContextGetter* GetMediaRequestContext() OVERRIDE;
80 virtual net::URLRequestContextGetter* GetMediaRequestContextForRenderProcess( 86 virtual net::URLRequestContextGetter* GetMediaRequestContextForRenderProcess(
81 int renderer_child_id) OVERRIDE; 87 int renderer_child_id) OVERRIDE;
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 // components/browser_context_keyed_service/browser_context_keyed_service_fa ctory.{h,cc} 297 // components/browser_context_keyed_service/browser_context_keyed_service_fa ctory.{h,cc}
292 298
293 Profile::Delegate* delegate_; 299 Profile::Delegate* delegate_;
294 300
295 chrome_browser_net::Predictor* predictor_; 301 chrome_browser_net::Predictor* predictor_;
296 302
297 DISALLOW_COPY_AND_ASSIGN(ProfileImpl); 303 DISALLOW_COPY_AND_ASSIGN(ProfileImpl);
298 }; 304 };
299 305
300 #endif // CHROME_BROWSER_PROFILES_PROFILE_IMPL_H_ 306 #endif // CHROME_BROWSER_PROFILES_PROFILE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698