OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
152 } | 152 } |
153 | 153 |
154 } // namespace | 154 } // namespace |
155 | 155 |
156 /////////////////////////////////////////////////////////////////////////////// | 156 /////////////////////////////////////////////////////////////////////////////// |
157 // | 157 // |
158 // ConflictsUI | 158 // ConflictsUI |
159 // | 159 // |
160 /////////////////////////////////////////////////////////////////////////////// | 160 /////////////////////////////////////////////////////////////////////////////// |
161 | 161 |
162 ConflictsUI::ConflictsUI(WebContents* contents) : WebUI(contents) { | 162 ConflictsUI::ConflictsUI(WebContents* contents) : WebUI(contents, this) { |
163 content::RecordAction(UserMetricsAction("ViewAboutConflicts")); | 163 content::RecordAction(UserMetricsAction("ViewAboutConflicts")); |
164 AddMessageHandler(new ConflictsDOMHandler()); | 164 AddMessageHandler(new ConflictsDOMHandler()); |
165 | 165 |
166 // Set up the about:conflicts source. | 166 // Set up the about:conflicts source. |
167 Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext()); | 167 Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext()); |
168 profile->GetChromeURLDataManager()->AddDataSource( | 168 profile->GetChromeURLDataManager()->AddDataSource( |
169 CreateConflictsUIHTMLSource()); | 169 CreateConflictsUIHTMLSource()); |
170 } | 170 } |
171 | 171 |
172 // static | 172 // static |
173 RefCountedMemory* ConflictsUI::GetFaviconResourceBytes() { | 173 RefCountedMemory* ConflictsUI::GetFaviconResourceBytes() { |
174 return ResourceBundle::GetSharedInstance(). | 174 return ResourceBundle::GetSharedInstance(). |
175 LoadDataResourceBytes(IDR_CONFLICT_FAVICON); | 175 LoadDataResourceBytes(IDR_CONFLICT_FAVICON); |
176 } | 176 } |
177 | 177 |
178 #endif | 178 #endif |
OLD | NEW |