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

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

Issue 1256803002: [Smart Lock, Prefs reconciliation] Prefs migration logic for desktop platforms. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix mac Created 5 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
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 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 #include "chrome/browser/gpu/three_d_api_observer.h" 62 #include "chrome/browser/gpu/three_d_api_observer.h"
63 #include "chrome/browser/media/media_capture_devices_dispatcher.h" 63 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
64 #include "chrome/browser/memory/oom_priority_manager.h" 64 #include "chrome/browser/memory/oom_priority_manager.h"
65 #include "chrome/browser/metrics/field_trial_synchronizer.h" 65 #include "chrome/browser/metrics/field_trial_synchronizer.h"
66 #include "chrome/browser/metrics/metrics_services_manager.h" 66 #include "chrome/browser/metrics/metrics_services_manager.h"
67 #include "chrome/browser/metrics/thread_watcher.h" 67 #include "chrome/browser/metrics/thread_watcher.h"
68 #include "chrome/browser/metrics/variations/variations_service.h" 68 #include "chrome/browser/metrics/variations/variations_service.h"
69 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h" 69 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h"
70 #include "chrome/browser/net/chrome_net_log.h" 70 #include "chrome/browser/net/chrome_net_log.h"
71 #include "chrome/browser/net/crl_set_fetcher.h" 71 #include "chrome/browser/net/crl_set_fetcher.h"
72 #include "chrome/browser/password_manager/password_manager_migration_service.h"
72 #include "chrome/browser/performance_monitor/performance_monitor.h" 73 #include "chrome/browser/performance_monitor/performance_monitor.h"
73 #include "chrome/browser/plugins/plugin_prefs.h" 74 #include "chrome/browser/plugins/plugin_prefs.h"
74 #include "chrome/browser/power/process_power_collector.h" 75 #include "chrome/browser/power/process_power_collector.h"
75 #include "chrome/browser/pref_service_flags_storage.h" 76 #include "chrome/browser/pref_service_flags_storage.h"
76 #include "chrome/browser/prefs/chrome_pref_service_factory.h" 77 #include "chrome/browser/prefs/chrome_pref_service_factory.h"
77 #include "chrome/browser/prefs/command_line_pref_store.h" 78 #include "chrome/browser/prefs/command_line_pref_store.h"
78 #include "chrome/browser/prefs/incognito_mode_prefs.h" 79 #include "chrome/browser/prefs/incognito_mode_prefs.h"
79 #include "chrome/browser/prefs/pref_metrics_service.h" 80 #include "chrome/browser/prefs/pref_metrics_service.h"
80 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" 81 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
81 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory. h" 82 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory. h"
(...skipping 1473 matching lines...) Expand 10 before | Expand all | Expand 10 after
1555 1556
1556 #if !defined(DISABLE_NACL) 1557 #if !defined(DISABLE_NACL)
1557 BrowserThread::PostTask( 1558 BrowserThread::PostTask(
1558 BrowserThread::IO, 1559 BrowserThread::IO,
1559 FROM_HERE, 1560 FROM_HERE,
1560 base::Bind(nacl::NaClProcessHost::EarlyStartup)); 1561 base::Bind(nacl::NaClProcessHost::EarlyStartup));
1561 #endif // !defined(DISABLE_NACL) 1562 #endif // !defined(DISABLE_NACL)
1562 1563
1563 // Make sure initial prefs are recorded 1564 // Make sure initial prefs are recorded
1564 PrefMetricsService::Factory::GetForProfile(profile_); 1565 PrefMetricsService::Factory::GetForProfile(profile_);
1566 password_manager::PasswordSettingsMigrationService::Factory::GetForProfile(
vabr (Chromium) 2015/08/07 08:48:02 nit: Add a blank line above this line, otherwise i
engedy 2015/08/07 11:41:38 It might be just that I have already forgotten why
melandory 2015/08/07 15:05:18 Before my concern was more emperical, I was gettin
melandory 2015/08/12 09:03:23 Done.
1567 profile_);
1565 1568
1566 PreBrowserStart(); 1569 PreBrowserStart();
1567 1570
1568 // Instantiate the notification UI manager, as this triggers a perf timer 1571 // Instantiate the notification UI manager, as this triggers a perf timer
1569 // used to measure startup time. TODO(stevenjb): Figure out what is actually 1572 // used to measure startup time. TODO(stevenjb): Figure out what is actually
1570 // triggering the timer and call that explicitly in the approprate place. 1573 // triggering the timer and call that explicitly in the approprate place.
1571 // http://crbug.com/105065. 1574 // http://crbug.com/105065.
1572 browser_process_->notification_ui_manager(); 1575 browser_process_->notification_ui_manager();
1573 1576
1574 // This must be called prior to RegisterComponentsForUpdate, in case the CLD 1577 // This must be called prior to RegisterComponentsForUpdate, in case the CLD
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
1802 chromeos::CrosSettings::Shutdown(); 1805 chromeos::CrosSettings::Shutdown();
1803 #endif // defined(OS_CHROMEOS) 1806 #endif // defined(OS_CHROMEOS)
1804 #endif // defined(OS_ANDROID) 1807 #endif // defined(OS_ANDROID)
1805 } 1808 }
1806 1809
1807 // Public members: 1810 // Public members:
1808 1811
1809 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 1812 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
1810 chrome_extra_parts_.push_back(parts); 1813 chrome_extra_parts_.push_back(parts);
1811 } 1814 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698