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

Side by Side Diff: chrome/browser/ui/webui/conflicts_ui.cc

Issue 10196004: Changed ChromeURLDataManager to a ProfileKeyedService and made a Factory for it. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Added static ChromeURLDataManager::AddSource() Created 8 years, 7 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/ui/webui/conflicts_ui.h" 5 #include "chrome/browser/ui/webui/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 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 // ConflictsUI 159 // ConflictsUI
160 // 160 //
161 /////////////////////////////////////////////////////////////////////////////// 161 ///////////////////////////////////////////////////////////////////////////////
162 162
163 ConflictsUI::ConflictsUI(content::WebUI* web_ui) : WebUIController(web_ui) { 163 ConflictsUI::ConflictsUI(content::WebUI* web_ui) : WebUIController(web_ui) {
164 content::RecordAction(UserMetricsAction("ViewAboutConflicts")); 164 content::RecordAction(UserMetricsAction("ViewAboutConflicts"));
165 web_ui->AddMessageHandler(new ConflictsDOMHandler()); 165 web_ui->AddMessageHandler(new ConflictsDOMHandler());
166 166
167 // Set up the about:conflicts source. 167 // Set up the about:conflicts source.
168 Profile* profile = Profile::FromWebUI(web_ui); 168 Profile* profile = Profile::FromWebUI(web_ui);
169 profile->GetChromeURLDataManager()->AddDataSource( 169 ChromeURLDataManager::AddDataSource(profile, CreateConflictsUIHTMLSource());
170 CreateConflictsUIHTMLSource());
171 } 170 }
172 171
173 // static 172 // static
174 RefCountedMemory* ConflictsUI::GetFaviconResourceBytes() { 173 RefCountedMemory* ConflictsUI::GetFaviconResourceBytes() {
175 return ResourceBundle::GetSharedInstance(). 174 return ResourceBundle::GetSharedInstance().
176 LoadDataResourceBytes(IDR_CONFLICT_FAVICON); 175 LoadDataResourceBytes(IDR_CONFLICT_FAVICON);
177 } 176 }
178 177
179 #endif 178 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698