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

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

Issue 10272004: Move RefCountedMemory class to base namespace. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/webui/conflicts_ui.h ('k') | chrome/browser/ui/webui/crashes_ui.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
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::AddDataSource(profile, CreateConflictsUIHTMLSource());
171 } 171 }
172 172
173 // static 173 // static
174 RefCountedMemory* ConflictsUI::GetFaviconResourceBytes() { 174 base::RefCountedMemory* ConflictsUI::GetFaviconResourceBytes() {
175 return static_cast<RefCountedMemory*>(ResourceBundle::GetSharedInstance(). 175 return static_cast<base::RefCountedMemory*>(
176 LoadDataResourceBytes(IDR_CONFLICT_FAVICON)); 176 ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
177 IDR_CONFLICT_FAVICON));
177 } 178 }
178 179
179 #endif 180 #endif
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/conflicts_ui.h ('k') | chrome/browser/ui/webui/crashes_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698