chrome/browser/ui/webui/crashes_ui.cc - Issue 7524002: Merge 94322 - 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 7524002: Merge 94322 - Rewire the metrics pref to the signed settings store on chromeos. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/835/src/

Patch Set: 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/user_cros_settings_provider.cc ('k') | chrome/browser/ui/webui/options/chromeos/stats_options_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

===================================================================

--- chrome/browser/ui/webui/crashes_ui.cc (revision 94348)

+++ chrome/browser/ui/webui/crashes_ui.cc (working copy)

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

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

#if defined(OS_CHROMEOS)

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

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

#endif

namespace {

@@ -175,7 +175,7 @@

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