summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcsilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-10 21:03:01 +0000
committercsilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-10 21:03:01 +0000
commit76f302ebe90ee7da645024f5901d496cb701ac93 (patch)
tree092440898a800ced376c59f0985f238cfe49fa09
parent8f41e1d9e19d24653118d8aada11ffa427a5f599 (diff)
downloadchromium_src-76f302ebe90ee7da645024f5901d496cb701ac93.zip
chromium_src-76f302ebe90ee7da645024f5901d496cb701ac93.tar.gz
chromium_src-76f302ebe90ee7da645024f5901d496cb701ac93.tar.bz2
dom-ui settings: Fix metrics preference for non CrOS Chrome builds.
BUG=62629 TEST=Verify that metrics checkbox does not cause DCHECK failure on Chrome build. Review URL: http://codereview.chromium.org/4654003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65702 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/resources/options/advanced_options.html8
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/resources/options/advanced_options.html b/chrome/browser/resources/options/advanced_options.html
index c317349..2ffe8d7 100644
--- a/chrome/browser/resources/options/advanced_options.html
+++ b/chrome/browser/resources/options/advanced_options.html
@@ -32,13 +32,19 @@
metric="Options_SafeBrowsingCheckbox" type="checkbox">
<span i18n-content="safeBrowsingEnableProtection"></span>
</label>
-<if expr="pp_ifdef('_google_chrome')">
+<if expr="pp_ifdef('_google_chrome') and pp_ifdef('chromeos')">
<label class="checkbox" id="metricsReportingSetting">
<input id="metricsReportingEnabled"
pref="cros.metrics.reportingEnabled" type="checkbox">
<span i18n-content="enableLogging"></span>
</label>
</if>
+<if expr="pp_ifdef('_google_chrome') and not pp_ifdef('chromeos')">
+ <label class="checkbox" id="metricsReportingSetting">
+ <input id="metricsReportingEnabled" type="checkbox">
+ <span i18n-content="enableLogging"></span>
+ </label>
+</if>
</div>
</section>
<section>