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

Side by Side Diff: chrome/browser/prefs/chrome_pref_service_factory.cc

Issue 450823002: Fix a typo that breaks Chrome builds. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 6 years, 4 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "chrome/browser/prefs/chrome_pref_service_factory.h" 5 #include "chrome/browser/prefs/chrome_pref_service_factory.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 // chrome/browser/extensions/api/music_manager_private/device_id_win.cc 349 // chrome/browser/extensions/api/music_manager_private/device_id_win.cc
350 // but that API is private (http://crbug.com/276485) and other platforms are 350 // but that API is private (http://crbug.com/276485) and other platforms are
351 // not available synchronously. 351 // not available synchronously.
352 // As part of improving pref metrics on other platforms we may want to find 352 // As part of improving pref metrics on other platforms we may want to find
353 // ways to defer preference loading until the device ID can be used. 353 // ways to defer preference loading until the device ID can be used.
354 rlz_lib::GetMachineId(&device_id); 354 rlz_lib::GetMachineId(&device_id);
355 #endif 355 #endif
356 std::string seed; 356 std::string seed;
357 #if defined(GOOGLE_CHROME_BUILD) 357 #if defined(GOOGLE_CHROME_BUILD)
358 seed = ResourceBundle::GetSharedInstance().GetRawDataResource( 358 seed = ResourceBundle::GetSharedInstance().GetRawDataResource(
359 IDR_PREF_HASH_SEED_BIN).as_string(), 359 IDR_PREF_HASH_SEED_BIN).as_string();
360 #endif 360 #endif
361 return make_scoped_ptr(new ProfilePrefStoreManager( 361 return make_scoped_ptr(new ProfilePrefStoreManager(
362 profile_path, 362 profile_path,
363 GetTrackingConfiguration(), 363 GetTrackingConfiguration(),
364 kTrackedPrefsReportingIDsCount, 364 kTrackedPrefsReportingIDsCount,
365 seed, 365 seed,
366 device_id, 366 device_id,
367 g_browser_process->local_state())); 367 g_browser_process->local_state()));
368 } 368 }
369 369
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
517 517
518 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { 518 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
519 ProfilePrefStoreManager::RegisterProfilePrefs(registry); 519 ProfilePrefStoreManager::RegisterProfilePrefs(registry);
520 } 520 }
521 521
522 void RegisterPrefs(PrefRegistrySimple* registry) { 522 void RegisterPrefs(PrefRegistrySimple* registry) {
523 ProfilePrefStoreManager::RegisterPrefs(registry); 523 ProfilePrefStoreManager::RegisterPrefs(registry);
524 } 524 }
525 525
526 } // namespace chrome_prefs 526 } // namespace chrome_prefs
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698