diff options
| author | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-09 04:06:23 +0000 |
|---|---|---|
| committer | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-09 04:06:23 +0000 |
| commit | 8456becde4132cdf2ef9b12217cc23b97aebb895 (patch) | |
| tree | f31a6f083450db5a82313b607588e4065f3bf54b /chrome/browser/browser_resources.grd | |
| parent | 507f5b062c149dc48e279f86a37c1fb0d9292b5f (diff) | |
| download | chromium_src-8456becde4132cdf2ef9b12217cc23b97aebb895.zip chromium_src-8456becde4132cdf2ef9b12217cc23b97aebb895.tar.gz chromium_src-8456becde4132cdf2ef9b12217cc23b97aebb895.tar.bz2 | |
Revert 221966 "Revert 221944 "Add UMA to report Preferences File..."
Re-apply and disable for Chrome Frame.
> Revert 221944 "Add UMA to report Preferences File Corruption"
>
> Breaks chrome_frame_tests on Win Aura.
> http://test-results.appspot.com/dashboards/flakiness_dashboard.html#group=%40ToT%20Chromium&testType=chrome_frame_tests&builder=Win%20Aura%20Tests%20(1)
>
> > Add UMA to report Preferences File Corruption
> > Adds PrefMetricsService methods to track changes to user preferences
> > that happen outside of Chrome and report discrepancies via UMA.
> >
> > BUG=266569
> >
> > Review URL: https://chromiumcodereview.appspot.com/22676002
>
> TBR=bbudge@chromium.org
>
> Review URL: https://codereview.chromium.org/23597020
TBR=bbudge@chromium.org
Review URL: https://codereview.chromium.org/23788010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221972 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_resources.grd')
| -rw-r--r-- | chrome/browser/browser_resources.grd | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd index 5c441ba..448b7c4 100644 --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd @@ -378,6 +378,9 @@ <include name="IDR_NETWORK_JS" file="resources\chromeos\network.js" type="BINDATA" /> <include name="IDR_NETWORK_CSS" file="resources\chromeos\network.css" type="BINDATA" /> </if> + <if expr="pp_ifdef('_google_chrome')"> + <include name="IDR_PREF_HASH_SEED_BIN" file="resources\settings_internal\pref_hash_seed.bin" type="BINDATA" /> + </if> </includes> </release> </grit> |