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

Side by Side Diff: chrome/browser/chrome_browser_main.cc

Issue 154593002: Refactor pref code out of ProfileImpl. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge up to r249119 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
« no previous file with comments | « no previous file | chrome/browser/prefs/chrome_pref_service_factory.h » ('j') | 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/chrome_browser_main.h" 5 #include "chrome/browser/chrome_browser_main.h"
6 6
7 #if defined(TOOLKIT_GTK) 7 #if defined(TOOLKIT_GTK)
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 #endif 9 #endif
10 10
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 #include "chrome/browser/performance_monitor/startup_timer.h" 79 #include "chrome/browser/performance_monitor/startup_timer.h"
80 #include "chrome/browser/plugins/plugin_prefs.h" 80 #include "chrome/browser/plugins/plugin_prefs.h"
81 #include "chrome/browser/pref_service_flags_storage.h" 81 #include "chrome/browser/pref_service_flags_storage.h"
82 #include "chrome/browser/prefs/chrome_pref_service_factory.h" 82 #include "chrome/browser/prefs/chrome_pref_service_factory.h"
83 #include "chrome/browser/prefs/command_line_pref_store.h" 83 #include "chrome/browser/prefs/command_line_pref_store.h"
84 #include "chrome/browser/prefs/pref_metrics_service.h" 84 #include "chrome/browser/prefs/pref_metrics_service.h"
85 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" 85 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
86 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory. h" 86 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory. h"
87 #include "chrome/browser/process_singleton.h" 87 #include "chrome/browser/process_singleton.h"
88 #include "chrome/browser/profiles/profile.h" 88 #include "chrome/browser/profiles/profile.h"
89 #include "chrome/browser/profiles/profile_impl.h"
90 #include "chrome/browser/profiles/profile_manager.h" 89 #include "chrome/browser/profiles/profile_manager.h"
91 #include "chrome/browser/profiles/profiles_state.h" 90 #include "chrome/browser/profiles/profiles_state.h"
92 #include "chrome/browser/shell_integration.h" 91 #include "chrome/browser/shell_integration.h"
93 #include "chrome/browser/three_d_api_observer.h" 92 #include "chrome/browser/three_d_api_observer.h"
94 #include "chrome/browser/translate/translate_service.h" 93 #include "chrome/browser/translate/translate_service.h"
95 #include "chrome/browser/ui/app_list/app_list_service.h" 94 #include "chrome/browser/ui/app_list/app_list_service.h"
96 #include "chrome/browser/ui/browser.h" 95 #include "chrome/browser/ui/browser.h"
97 #include "chrome/browser/ui/browser_finder.h" 96 #include "chrome/browser/ui/browser_finder.h"
98 #include "chrome/browser/ui/host_desktop.h" 97 #include "chrome/browser/ui/host_desktop.h"
99 #include "chrome/browser/ui/startup/default_browser_prompt.h" 98 #include "chrome/browser/ui/startup/default_browser_prompt.h"
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after
513 DISALLOW_COPY_AND_ASSIGN(LoadCompleteListener); 512 DISALLOW_COPY_AND_ASSIGN(LoadCompleteListener);
514 }; 513 };
515 514
516 void InitializeAllPrefHashStores() { 515 void InitializeAllPrefHashStores() {
517 ProfileInfoCache& profile_info_cache = 516 ProfileInfoCache& profile_info_cache =
518 g_browser_process->profile_manager()->GetProfileInfoCache(); 517 g_browser_process->profile_manager()->GetProfileInfoCache();
519 size_t n_profiles = profile_info_cache.GetNumberOfProfiles(); 518 size_t n_profiles = profile_info_cache.GetNumberOfProfiles();
520 for (size_t i = 0; i < n_profiles; ++i) { 519 for (size_t i = 0; i < n_profiles; ++i) {
521 base::FilePath profile_path = 520 base::FilePath profile_path =
522 profile_info_cache.GetPathOfProfileAtIndex(i); 521 profile_info_cache.GetPathOfProfileAtIndex(i);
523 ProfileImpl::InitializePrefHashStoreIfRequired(profile_path); 522 chrome_prefs::InitializePrefHashStoreIfRequired(profile_path);
524 } 523 }
525 } 524 }
526 } // namespace 525 } // namespace
527 526
528 namespace chrome_browser { 527 namespace chrome_browser {
529 528
530 // This error message is not localized because we failed to load the 529 // This error message is not localized because we failed to load the
531 // localization data files. 530 // localization data files.
532 #if defined(OS_WIN) 531 #if defined(OS_WIN)
533 const char kMissingLocaleDataTitle[] = "Missing File Error"; 532 const char kMissingLocaleDataTitle[] = "Missing File Error";
(...skipping 1168 matching lines...) Expand 10 before | Expand all | Expand 10 after
1702 chromeos::CrosSettings::Shutdown(); 1701 chromeos::CrosSettings::Shutdown();
1703 #endif 1702 #endif
1704 #endif 1703 #endif
1705 } 1704 }
1706 1705
1707 // Public members: 1706 // Public members:
1708 1707
1709 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 1708 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
1710 chrome_extra_parts_.push_back(parts); 1709 chrome_extra_parts_.push_back(parts);
1711 } 1710 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/prefs/chrome_pref_service_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698