chrome/browser/chromeos/login/helper.cc - Issue 6899021: HWID and VPD values should be accessible via SystemAccess::GetMachineStatistic

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/chromeos/login/helper.cc

Issue 6899021: HWID and VPD values should be accessible via SystemAccess::GetMachineStatistic (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: unit_test Created 9 years, 8 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/customization_document_unittest.cc ('k') | chrome/browser/chromeos/mock_system_access.h » ('j') | chrome/browser/chromeos/system_access.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/helper.cc

diff --git a/chrome/browser/chromeos/login/helper.cc b/chrome/browser/chromeos/login/helper.cc

index e0842e5c4503fcb295c1da56612921f91765fc09..3dd8b017d2a5b813ff026a703ca058fbc06dfef4 100644

--- a/chrome/browser/chromeos/login/helper.cc

+++ b/chrome/browser/chromeos/login/helper.cc

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

#include "base/file_util.h"

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

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

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

#include "chrome/browser/google/google_util.h"

#include "googleurl/src/gurl.h"

#include "grit/generated_resources.h"

@@ -227,8 +228,9 @@ const chromeos::StartupCustomizationDocument* LoadStartupManifest() {

base::ThreadRestrictions::ScopedAllowIO allow_io;

FilePath startup_manifest_path(kStartupCustomizationManifestPath);

if (file_util::PathExists(startup_manifest_path)) {

+ chromeos::SystemAccess* system = chromeos::SystemAccess::GetInstance();

scoped_ptr<chromeos::StartupCustomizationDocument> customization(

- new chromeos::StartupCustomizationDocument());

+ new chromeos::StartupCustomizationDocument(system));

bool manifest_loaded = customization->LoadManifestFromFile(

startup_manifest_path);

if (manifest_loaded) {