chrome/browser/first_run/first_run_win.cc - Issue 3836005: Move pe_image and registry from base to base/win and use the namespace. It re...

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/first_run/first_run_win.cc

Issue 3836005: Move pe_image and registry from base to base/win and use the namespace. It re... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 10 years, 2 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/extensions/external_registry_extension_provider_win.cc ('k') | chrome/browser/history/history_publisher_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/first_run/first_run_win.cc

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

--- chrome/browser/first_run/first_run_win.cc (revision 62848)

+++ chrome/browser/first_run/first_run_win.cc (working copy)

@@ -18,12 +18,12 @@

#include "base/file_util.h"

#include "base/object_watcher.h"

#include "base/path_service.h"

-#include "base/registry.h"

#include "base/scoped_comptr_win.h"

#include "base/scoped_ptr.h"

#include "base/string_number_conversions.h"

#include "base/string_split.h"

#include "base/utf_string_conversions.h"

+#include "base/win/registry.h"

#include "base/win/windows_version.h"

#include "chrome/browser/extensions/extensions_service.h"

#include "chrome/browser/extensions/extension_updater.h"

@@ -280,7 +280,7 @@

bool user_install = InstallUtil::IsPerUserInstall(curr_chrome_exe.c_str());

HKEY reg_root = user_install ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE;

BrowserDistribution *dist = BrowserDistribution::GetDistribution();

- RegKey key;

+ base::win::RegKey key;

std::wstring rename_cmd;

if (key.Open(reg_root, dist->GetVersionKey().c_str(), KEY_READ) &&

key.ReadValue(google_update::kRegRenameCmdField, &rename_cmd)) {