chrome/browser/chrome_browser_main.cc - Issue 1256803002: [Smart Lock, Prefs reconciliation] Prefs migration logic for desktop platforms.

Unified 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « no previous file | chrome/browser/password_manager/password_manager_migration_service.h » ('j') | chrome/browser/password_manager/password_manager_migration_service.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chrome_browser_main.cc

diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc

index 669b84e44ee92fa57fc7e7a1b1b72c036fd838b0..f86f6d7b7ff7882d7488c56d871b9fa1e451cbd5 100644

--- a/chrome/browser/chrome_browser_main.cc

+++ b/chrome/browser/chrome_browser_main.cc

@@ -69,6 +69,7 @@

#include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h"

#include "chrome/browser/net/chrome_net_log.h"

#include "chrome/browser/net/crl_set_fetcher.h"

+#include "chrome/browser/password_manager/password_manager_migration_service.h"

#include "chrome/browser/performance_monitor/performance_monitor.h"

#include "chrome/browser/plugins/plugin_prefs.h"

#include "chrome/browser/power/process_power_collector.h"

@@ -1562,6 +1563,8 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {

// Make sure initial prefs are recorded

PrefMetricsService::Factory::GetForProfile(profile_);

+ 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.

+ profile_);

PreBrowserStart();