| commit | d55a40d24fe9cb351fd91b8538754e8bb24314d5 | [log] [tgz] |
|---|---|---|
| author | Alexei Svitkine <[email protected]> | Sun Nov 25 19:18:18 2018 |
| committer | Commit Bot <[email protected]> | Sun Nov 25 19:18:18 2018 |
| tree | 58768edf51341868777e98e0e6f342cda267c8f5 | |
| parent | 314d2ea22ea8e1f35320945e14239f1e8985cfd9 [diff] [blame] |
Revert "Read master preferences before create variations" This reverts commit 18483d6acf26f1c21194b3425013902166b51dd4. Reason for revert: Crash in official build due to resourcebundle not being initialized: crbug.com/908259 Original change's description: > Read master preferences before create variations > to allow to migrate variations from master preferences to Local State > > Change-Id: I25cca8a8265e2fae57d5d0a13b053e577a9bba11 > > Bug: 907434 > Change-Id: I25cca8a8265e2fae57d5d0a13b053e577a9bba11 > Reviewed-on: https://chromium-review.googlesource.com/c/1344097 > Commit-Queue: Alexei Svitkine <[email protected]> > Reviewed-by: Jochen Eisinger <[email protected]> > Reviewed-by: Alexei Svitkine <[email protected]> > Cr-Commit-Position: refs/heads/master@{#610635} [email protected],[email protected],[email protected],[email protected],[email protected] # Not skipping CQ checks because original CL landed > 1 day ago. Bug: 907434 Change-Id: Ic48accb1c33bb5206dac265596628d8225ee2683 Reviewed-on: https://chromium-review.googlesource.com/c/1350201 Reviewed-by: Alexei Svitkine <[email protected]> Commit-Queue: Alexei Svitkine <[email protected]> Cr-Commit-Position: refs/heads/master@{#610737}
diff --git a/chrome/browser/chrome_browser_main.h b/chrome/browser/chrome_browser_main.h index dba40fc0..f21f7543 100644 --- a/chrome/browser/chrome_browser_main.h +++ b/chrome/browser/chrome_browser_main.h
@@ -123,6 +123,11 @@ // if the ResourceBundle couldn't be loaded. int OnLocalStateLoaded(bool* failed_to_load_resource_bundle); + // Applies any preferences (to local state) needed for first run. This is + // always called and early outs if not first-run. Return value is an exit + // status, RESULT_CODE_NORMAL_EXIT indicates success. + int ApplyFirstRunPrefs(); + // Methods for Main Message Loop ------------------------------------------- int PreCreateThreadsImpl();