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

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

Issue 11881055: Simplify WebUI data sources. Currently WebUI data sources implement a URLDataSourceDelegate interfa… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix issue in about_ui exposed by cros tests Created 7 years, 11 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 // ConflictsUI 160 // ConflictsUI
161 // 161 //
162 /////////////////////////////////////////////////////////////////////////////// 162 ///////////////////////////////////////////////////////////////////////////////
163 163
164 ConflictsUI::ConflictsUI(content::WebUI* web_ui) : WebUIController(web_ui) { 164 ConflictsUI::ConflictsUI(content::WebUI* web_ui) : WebUIController(web_ui) {
165 content::RecordAction(UserMetricsAction("ViewAboutConflicts")); 165 content::RecordAction(UserMetricsAction("ViewAboutConflicts"));
166 web_ui->AddMessageHandler(new ConflictsDOMHandler()); 166 web_ui->AddMessageHandler(new ConflictsDOMHandler());
167 167
168 // Set up the about:conflicts source. 168 // Set up the about:conflicts source.
169 Profile* profile = Profile::FromWebUI(web_ui); 169 Profile* profile = Profile::FromWebUI(web_ui);
170 ChromeURLDataManager::AddDataSource(profile, CreateConflictsUIHTMLSource()); 170 ChromeURLDataManager::AddDataSourceImpl(profile,
171 CreateConflictsUIHTMLSource());
171 } 172 }
172 173
173 // static 174 // static
174 base::RefCountedMemory* ConflictsUI::GetFaviconResourceBytes( 175 base::RefCountedMemory* ConflictsUI::GetFaviconResourceBytes(
175 ui::ScaleFactor scale_factor) { 176 ui::ScaleFactor scale_factor) {
176 return static_cast<base::RefCountedMemory*>( 177 return static_cast<base::RefCountedMemory*>(
177 ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( 178 ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale(
178 IDR_CONFLICT_FAVICON, scale_factor)); 179 IDR_CONFLICT_FAVICON, scale_factor));
179 } 180 }
180 181
181 #endif 182 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698