|
|
Merge 22284 - Refactoring of master preferences parsing before adding a new preference.
Currently we are parsing master preferences file three time on startup. Since we only return an int bit mask flag after parsing preferences, it can not handle any preference other than boolean and we end up reading it again for first run tabs and ping delay. This change refactors all the preferences parsing logic to directly pass around DictionaryValue object around in Chrome as well as installer.
No functional change but this will make adding a new preference for new icon more logical since we will not read the preferences file once again.
BUG= 12701
TEST=Make sure all the distribution preferences still work as before.
Review URL: http://codereview.chromium.org/159539
TBR=kuchhal@chromium.org
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=23179
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+325 lines, -367 lines) |
Patch |
 |
MM |
chrome/browser/browser_main.cc
|
View
|
|
2 chunks |
+6 lines, -6 lines |
0 comments
|
Download
|
 |
MM |
chrome/browser/first_run.h
|
View
|
|
2 chunks |
+3 lines, -3 lines |
0 comments
|
Download
|
 |
MM |
chrome/browser/first_run_win.cc
|
View
|
|
6 chunks |
+26 lines, -22 lines |
0 comments
|
Download
|
 |
MM |
chrome/common/temp_scaffolding_stubs.cc
|
View
|
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
MM |
chrome/installer/setup/install.h
|
View
|
|
3 chunks |
+3 lines, -4 lines |
0 comments
|
Download
|
 |
MM |
chrome/installer/setup/install.cc
|
View
|
|
7 chunks |
+31 lines, -26 lines |
0 comments
|
Download
|
 |
MM |
chrome/installer/setup/setup_main.cc
|
View
|
|
12 chunks |
+67 lines, -74 lines |
0 comments
|
Download
|
 |
MM |
chrome/installer/util/browser_distribution.h
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
MM |
chrome/installer/util/browser_distribution.cc
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
MM |
chrome/installer/util/google_chrome_distribution.h
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
MM |
chrome/installer/util/google_chrome_distribution.cc
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
MM |
chrome/installer/util/google_chrome_distribution_unittest.cc
|
View
|
|
3 chunks |
+50 lines, -27 lines |
0 comments
|
Download
|
 |
MM |
chrome/installer/util/master_preferences.h
|
View
|
|
4 chunks |
+67 lines, -60 lines |
0 comments
|
Download
|
 |
MM |
chrome/installer/util/master_preferences.cc
|
View
|
|
2 chunks |
+66 lines, -114 lines |
0 comments
|
Download
|
 |
MM |
chrome/installer/util/util_constants.h
|
View
|
|
1 chunk |
+0 lines, -25 lines |
0 comments
|
Download
|
Total messages: 1 (0 generated)
|