chrome/browser/user_style_sheet_watcher.cc - Issue 6670081: Move FilePathWatcher class from browser/... to common/...

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/user_style_sheet_watcher.cc

Issue 6670081: Move FilePathWatcher class from browser/... to common/... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix up linux clang issue, and clean up bad commented block Created 9 years, 9 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:

Index: chrome/browser/user_style_sheet_watcher.cc

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

index 347462c5e4913d21e472834fd170a0274123166c..9a314b3c4650a8a1cde716aa1c8c9cf16087b6cb 100644

--- a/chrome/browser/user_style_sheet_watcher.cc

+++ b/chrome/browser/user_style_sheet_watcher.cc

@@ -148,8 +148,12 @@ void UserStyleSheetWatcher::Init() {

file_watcher_.reset(new FilePathWatcher);

FilePath style_sheet_file = profile_path_.AppendASCII(kStyleSheetDir)

.AppendASCII(kUserStyleSheetFile);

- if (!file_watcher_->Watch(style_sheet_file, loader_.get()))

+ if (!file_watcher_->Watch(

+ style_sheet_file,

+ loader_.get(),

+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI))) {

LOG(ERROR) << "Failed to setup watch for " << style_sheet_file.value();

+ }

loader_->LoadStyleSheet(style_sheet_file);

}