chrome/browser/first_run/first_run_win.cc - Issue 5971008: move base/object_watcher into base/win and add the win namespace. Fixup calle...

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 5971008: move base/object_watcher into base/win and add the win namespace. Fixup calle... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 9 years, 12 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/file_path_watcher/file_path_watcher_win.cc ('k') | chrome/browser/policy/configuration_policy_loader_win.h » ('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 70358)

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

@@ -16,13 +16,13 @@

#include "app/resource_bundle.h"

#include "base/environment.h"

#include "base/file_util.h"

-#include "base/object_watcher.h"

#include "base/path_service.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/object_watcher.h"

#include "base/win/registry.h"

#include "base/win/windows_version.h"

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

@@ -321,7 +321,7 @@

// process has ended and what was the result of the operation as reported by

// the process exit code. This class executes in the context of the main chrome

// process.

-class ImportProcessRunner : public base::ObjectWatcher::Delegate {

+class ImportProcessRunner : public base::win::ObjectWatcher::Delegate {

public:

// The constructor takes the importer process to watch and then it does a

// message loop blocking wait until the process ends. This object now owns

@@ -350,7 +350,7 @@

}

private:

- base::ObjectWatcher watcher_;

+ base::win::ObjectWatcher watcher_;

base::ProcessHandle import_process_;

DWORD exit_code_;

};