OLD | NEW |
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 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
200 BrowserThread::PostTask( | 200 BrowserThread::PostTask( |
201 BrowserThread::IO, FROM_HERE, | 201 BrowserThread::IO, FROM_HERE, |
202 NewRunnableMethod(Singleton<ChromeURLDataManager>::get(), | 202 NewRunnableMethod(Singleton<ChromeURLDataManager>::get(), |
203 &ChromeURLDataManager::AddDataSource, | 203 &ChromeURLDataManager::AddDataSource, |
204 make_scoped_refptr(html_source))); | 204 make_scoped_refptr(html_source))); |
205 } | 205 } |
206 | 206 |
207 // static | 207 // static |
208 RefCountedMemory* ConflictsUI::GetFaviconResourceBytes() { | 208 RefCountedMemory* ConflictsUI::GetFaviconResourceBytes() { |
209 return ResourceBundle::GetSharedInstance(). | 209 return ResourceBundle::GetSharedInstance(). |
210 LoadDataResourceBytes(IDR_CONFLICTS); | 210 LoadDataResourceBytes(IDR_CONFLICT_MENU); |
211 } | 211 } |
212 | 212 |
213 #endif | 213 #endif |
OLD | NEW |