chrome/browser/chrome_browser_main.cc - Issue 7867044: PART1: Initiated the SignedSettings refactoring.

Unified Diff: chrome/browser/chrome_browser_main.cc

Issue 7867044: PART1: Initiated the SignedSettings refactoring. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased on ToT (solved merging conflict). Created 9 years, 1 month 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

« chrome/browser/automation/testing_automation_provider_chromeos.cc ('K') | « chrome/browser/automation/testing_automation_provider_chromeos.cc ('k') | chrome/browser/chromeos/cros/network_library.cc » ('j') | chrome/browser/chromeos/cros_settings.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chrome_browser_main.cc

diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc

index ab2b807298bf7ffbff46d8103dc8639f3b0c8906..5cc423fa937628a267dac8ed9a89c85a868f8596 100644

--- a/chrome/browser/chrome_browser_main.cc

+++ b/chrome/browser/chrome_browser_main.cc

@@ -129,6 +129,7 @@

#if defined(OS_CHROMEOS)

#include "chrome/browser/chromeos/audio_handler.h"

#include "chrome/browser/chromeos/boot_times_loader.h"

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

Mattias Nissler (ping if slow) 2011/11/18 14:12:00 cros_settings.h and cros_settings_names.h should b

pastarmovj 2011/11/18 15:01:38 Done.

#include "chrome/browser/chromeos/cros/cros_library.h"

#include "chrome/browser/chromeos/cros/screen_lock_library.h"

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

@@ -142,7 +143,6 @@

#include "chrome/browser/chromeos/login/user_manager.h"

#include "chrome/browser/chromeos/system/runtime_environment.h"

#include "chrome/browser/chromeos/system_key_event_listener.h"

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

#include "chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h"

#include "chrome/browser/oom_priority_manager.h"

#include "chrome/browser/ui/views/browser_dialogs.h"

@@ -624,9 +624,12 @@ bool IsCrashReportingEnabled(const PrefService* local_state) {

CommandLine::ForCurrentProcess()->HasSwitch(switches::kGuestSession);

bool is_stable_channel =

chrome::VersionInfo::GetChannel() == chrome::VersionInfo::CHANNEL_STABLE;

+ // TODO(pastarmovj): Consider the TrustedGet here.

+ bool reporting_enabled;

+ chromeos::CrosSettings::Get()->GetBoolean(chromeos::kStatsReportingPref,

+ &reporting_enabled);

bool breakpad_enabled =

- !(is_guest_session && is_stable_channel) &&

- chromeos::UserCrosSettingsProvider::cached_reporting_enabled();

+ !(is_guest_session && is_stable_channel) && reporting_enabled;

if (!breakpad_enabled)

breakpad_enabled = getenv(env_vars::kHeadless) != NULL;

#else

@@ -1109,7 +1112,9 @@ MetricsService* ChromeBrowserMainParts::InitializeMetrics(

// non-official builds.

#if defined(GOOGLE_CHROME_BUILD)

#if defined(OS_CHROMEOS)

- bool enabled = chromeos::UserCrosSettingsProvider::cached_reporting_enabled();

+ bool enabled;

+ chromeos::CrosSettings::Get()->GetBoolean(chromeos::kStatsReportingPref,

+ &enabled);

#else

bool enabled = local_state->GetBoolean(prefs::kMetricsReportingEnabled);

#endif // #if defined(OS_CHROMEOS)