chrome/browser/ui/webui/crashes_ui.cc - Issue 7480040: Rewire the metrics pref to the signed settings store on chromeos.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/crashes_ui.cc

Issue 7480040: Rewire the metrics pref to the signed settings store on chromeos. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixed the initial metrics setting from the EULA screen. Created 9 years, 5 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:

Index: chrome/browser/ui/webui/crashes_ui.cc

diff --git a/chrome/browser/ui/webui/crashes_ui.cc b/chrome/browser/ui/webui/crashes_ui.cc

index f137b3b1fc482d605909fcd0c9a2a998825d32aa..3780af5bc80ea0384783e5b93ad11f93c4940873 100644

--- a/chrome/browser/ui/webui/crashes_ui.cc

+++ b/chrome/browser/ui/webui/crashes_ui.cc

@@ -28,7 +28,8 @@

#include "ui/base/resource/resource_bundle.h"

#if defined(OS_CHROMEOS)

-#include "chrome/browser/chromeos/metrics_cros_settings_provider.h"

+#include "chrome/browser/chromeos/cros_settings_names.h"

Mattias Nissler (ping if slow) 2011/07/27 16:10:34 still need this include?

pastarmovj 2011/07/27 16:25:09 Done.

+#include "chrome/browser/chromeos/user_cros_settings_provider.h"

#endif

namespace {

@@ -175,7 +176,7 @@ bool CrashesUI::CrashReportingEnabled() {

PrefService* prefs = g_browser_process->local_state();

return prefs->GetBoolean(prefs::kMetricsReportingEnabled);

#elif defined(GOOGLE_CHROME_BUILD) && defined(OS_CHROMEOS)

- return chromeos::MetricsCrosSettingsProvider::GetMetricsStatus();

+ return chromeos::UserCrosSettingsProvider::cached_reporting_enabled();

#else

return false;

#endif