| OLD | NEW |
| 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 Loading... |
| 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 |
| OLD | NEW |