chrome/browser/dom_ui/conflicts_ui.cc - Issue 5519016: Add a new GetInstance() method for singleton classes used in chrome/browser files.

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/dom_ui/conflicts_ui.cc

Issue 5519016: Add a new GetInstance() method for singleton classes used in chrome/browser files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 10 years 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/dom_ui/conflicts_ui.cc

diff --git a/chrome/browser/dom_ui/conflicts_ui.cc b/chrome/browser/dom_ui/conflicts_ui.cc

index f1e626176de961af415eea4191f18d6f041d01de..8e2bcae9553e6c5a2f6dfdc167c76f77c95a8bb2 100644

--- a/chrome/browser/dom_ui/conflicts_ui.cc

+++ b/chrome/browser/dom_ui/conflicts_ui.cc

@@ -204,9 +204,9 @@ ConflictsUI::ConflictsUI(TabContents* contents) : DOMUI(contents) {

// Set up the about:conflicts source.

BrowserThread::PostTask(

BrowserThread::IO, FROM_HERE,

- NewRunnableMethod(Singleton<ChromeURLDataManager>::get(),

- &ChromeURLDataManager::AddDataSource,

- make_scoped_refptr(html_source)));

+ NewRunnableMethod(ChromeURLDataManager::GetInstance(),

+ &ChromeURLDataManager::AddDataSource,

+ make_scoped_refptr(html_source)));

}

// static

« no previous file with comments | « chrome/browser/dom_ui/chrome_url_data_manager.cc ('k') | chrome/browser/dom_ui/downloads_dom_handler.cc » ('j') | no next file with comments »