Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(250)

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/dom_ui/conflicts_ui.h" 5 #include "chrome/browser/dom_ui/conflicts_ui.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 UserMetrics::RecordAction( 197 UserMetrics::RecordAction(
198 UserMetricsAction("ViewAboutConflicts"), contents->profile()); 198 UserMetricsAction("ViewAboutConflicts"), contents->profile());
199 199
200 AddMessageHandler((new ConflictsDOMHandler())->Attach(this)); 200 AddMessageHandler((new ConflictsDOMHandler())->Attach(this));
201 201
202 ConflictsUIHTMLSource* html_source = new ConflictsUIHTMLSource(); 202 ConflictsUIHTMLSource* html_source = new ConflictsUIHTMLSource();
203 203
204 // Set up the about:conflicts source. 204 // Set up the about:conflicts source.
205 BrowserThread::PostTask( 205 BrowserThread::PostTask(
206 BrowserThread::IO, FROM_HERE, 206 BrowserThread::IO, FROM_HERE,
207 NewRunnableMethod(Singleton<ChromeURLDataManager>::get(), 207 NewRunnableMethod(ChromeURLDataManager::GetInstance(),
208 &ChromeURLDataManager::AddDataSource, 208 &ChromeURLDataManager::AddDataSource,
209 make_scoped_refptr(html_source))); 209 make_scoped_refptr(html_source)));
210 } 210 }
211 211
212 // static 212 // static
213 RefCountedMemory* ConflictsUI::GetFaviconResourceBytes() { 213 RefCountedMemory* ConflictsUI::GetFaviconResourceBytes() {
214 return ResourceBundle::GetSharedInstance(). 214 return ResourceBundle::GetSharedInstance().
215 LoadDataResourceBytes(IDR_CONFLICT_FAVICON); 215 LoadDataResourceBytes(IDR_CONFLICT_FAVICON);
216 } 216 }
217 217
218 #endif 218 #endif
OLDNEW
« 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 »

Powered by Google App Engine
This is Rietveld 408576698