Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(376)

Unified Diff: chrome/browser/chromeos/customization_document.cc

Issue 7324017: Split SystemAccess into TimezoneSettings, StatisticsProvider, and SyslogsProvider. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address comments 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
Index: chrome/browser/chromeos/customization_document.cc
diff --git a/chrome/browser/chromeos/customization_document.cc b/chrome/browser/chromeos/customization_document.cc
index 8af62dcdb56d30fa2a81adeb81a8d326210be09b..36c198ac6ad5f300204009fe8e4abb64d968e556 100644
--- a/chrome/browser/chromeos/customization_document.cc
+++ b/chrome/browser/chromeos/customization_document.cc
@@ -16,7 +16,7 @@
#include "chrome/browser/chromeos/cros/cros_library.h"
#include "chrome/browser/chromeos/cros/network_library.h"
#include "chrome/browser/chromeos/login/wizard_controller.h"
-#include "chrome/browser/chromeos/system_access.h"
+#include "chrome/browser/chromeos/system/statistics_provider.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "content/browser/browser_thread.h"
@@ -147,13 +147,14 @@ StartupCustomizationDocument::StartupCustomizationDocument() {
base::ThreadRestrictions::ScopedAllowIO allow_io;
LoadManifestFromFile(FilePath(kStartupCustomizationManifestPath));
}
- Init(SystemAccess::GetInstance());
+ Init(chromeos::system::StatisticsProvider::GetInstance());
}
StartupCustomizationDocument::StartupCustomizationDocument(
- SystemAccess* system_access, const std::string& manifest) {
+ chromeos::system::StatisticsProvider* statistics_provider,
+ const std::string& manifest) {
LoadManifestFromString(manifest);
- Init(system_access);
+ Init(statistics_provider);
}
StartupCustomizationDocument::~StartupCustomizationDocument() {}
@@ -163,7 +164,8 @@ StartupCustomizationDocument* StartupCustomizationDocument::GetInstance() {
DefaultSingletonTraits<StartupCustomizationDocument> >::get();
}
-void StartupCustomizationDocument::Init(SystemAccess* system_access) {
+void StartupCustomizationDocument::Init(
+ chromeos::system::StatisticsProvider* statistics_provider) {
if (!IsReady())
return;
@@ -173,7 +175,7 @@ void StartupCustomizationDocument::Init(SystemAccess* system_access) {
root_->GetString(kRegistrationUrlAttr, &registration_url_);
std::string hwid;
- if (system_access->GetMachineStatistic(kHardwareClass, &hwid)) {
+ if (statistics_provider->GetMachineStatistic(kHardwareClass, &hwid)) {
ListValue* hwid_list = NULL;
if (root_->GetList(kHwidMapAttr, &hwid_list)) {
for (size_t i = 0; i < hwid_list->GetSize(); ++i) {
@@ -204,9 +206,12 @@ void StartupCustomizationDocument::Init(SystemAccess* system_access) {
LOG(ERROR) << "HWID is missing in machine statistics";
}
- system_access->GetMachineStatistic(kInitialLocaleAttr, &initial_locale_);
- system_access->GetMachineStatistic(kInitialTimezoneAttr, &initial_timezone_);
- system_access->GetMachineStatistic(kKeyboardLayoutAttr, &keyboard_layout_);
+ statistics_provider->GetMachineStatistic(kInitialLocaleAttr,
+ &initial_locale_);
+ statistics_provider->GetMachineStatistic(kInitialTimezoneAttr,
+ &initial_timezone_);
+ statistics_provider->GetMachineStatistic(kKeyboardLayoutAttr,
+ &keyboard_layout_);
}
std::string StartupCustomizationDocument::GetHelpPage(
« no previous file with comments | « chrome/browser/chromeos/customization_document.h ('k') | chrome/browser/chromeos/customization_document_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698