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 |
11 #include "base/string_number_conversions.h" | 11 #include "base/string_number_conversions.h" |
12 #include "base/utf_string_conversions.h" | 12 #include "base/utf_string_conversions.h" |
13 #include "base/values.h" | 13 #include "base/values.h" |
14 #include "chrome/browser/dom_ui/chrome_url_data_manager.h" | 14 #include "chrome/browser/dom_ui/chrome_url_data_manager.h" |
15 #include "chrome/browser/enumerate_modules_model_win.h" | 15 #include "chrome/browser/enumerate_modules_model_win.h" |
16 #include "chrome/browser/metrics/user_metrics.h" | 16 #include "chrome/browser/metrics/user_metrics.h" |
| 17 #include "chrome/browser/profiles/profile.h" |
17 #include "chrome/browser/tab_contents/tab_contents.h" | 18 #include "chrome/browser/tab_contents/tab_contents.h" |
18 #include "chrome/common/jstemplate_builder.h" | 19 #include "chrome/common/jstemplate_builder.h" |
19 #include "chrome/common/notification_observer.h" | 20 #include "chrome/common/notification_observer.h" |
20 #include "chrome/common/notification_registrar.h" | 21 #include "chrome/common/notification_registrar.h" |
21 #include "chrome/common/notification_service.h" | 22 #include "chrome/common/notification_service.h" |
22 #include "chrome/common/url_constants.h" | 23 #include "chrome/common/url_constants.h" |
23 #include "grit/browser_resources.h" | 24 #include "grit/browser_resources.h" |
24 #include "grit/chromium_strings.h" | 25 #include "grit/chromium_strings.h" |
25 #include "grit/generated_resources.h" | 26 #include "grit/generated_resources.h" |
26 #include "grit/theme_resources.h" | 27 #include "grit/theme_resources.h" |
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
195 | 196 |
196 ConflictsUI::ConflictsUI(TabContents* contents) : DOMUI(contents) { | 197 ConflictsUI::ConflictsUI(TabContents* contents) : DOMUI(contents) { |
197 UserMetrics::RecordAction( | 198 UserMetrics::RecordAction( |
198 UserMetricsAction("ViewAboutConflicts"), contents->profile()); | 199 UserMetricsAction("ViewAboutConflicts"), contents->profile()); |
199 | 200 |
200 AddMessageHandler((new ConflictsDOMHandler())->Attach(this)); | 201 AddMessageHandler((new ConflictsDOMHandler())->Attach(this)); |
201 | 202 |
202 ConflictsUIHTMLSource* html_source = new ConflictsUIHTMLSource(); | 203 ConflictsUIHTMLSource* html_source = new ConflictsUIHTMLSource(); |
203 | 204 |
204 // Set up the about:conflicts source. | 205 // Set up the about:conflicts source. |
205 BrowserThread::PostTask( | 206 contents->profile()->GetChromeURLDataManager()->AddDataSource(html_source); |
206 BrowserThread::IO, FROM_HERE, | |
207 NewRunnableMethod(ChromeURLDataManager::GetInstance(), | |
208 &ChromeURLDataManager::AddDataSource, | |
209 make_scoped_refptr(html_source))); | |
210 } | 207 } |
211 | 208 |
212 // static | 209 // static |
213 RefCountedMemory* ConflictsUI::GetFaviconResourceBytes() { | 210 RefCountedMemory* ConflictsUI::GetFaviconResourceBytes() { |
214 return ResourceBundle::GetSharedInstance(). | 211 return ResourceBundle::GetSharedInstance(). |
215 LoadDataResourceBytes(IDR_CONFLICT_FAVICON); | 212 LoadDataResourceBytes(IDR_CONFLICT_FAVICON); |
216 } | 213 } |
217 | 214 |
218 #endif | 215 #endif |
OLD | NEW |