| 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 #ifndef CHROME_BROWSER_UI_WEBUI_CONFLICTS_UI_H_ | 5 #ifndef CHROME_BROWSER_UI_WEBUI_CONFLICTS_UI_H_ |
| 6 #define CHROME_BROWSER_UI_WEBUI_CONFLICTS_UI_H_ | 6 #define CHROME_BROWSER_UI_WEBUI_CONFLICTS_UI_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include "content/browser/webui/web_ui.h" | 9 #include "content/browser/webui/web_ui.h" |
| 10 #include "content/public/browser/web_ui_controller.h" |
| 10 | 11 |
| 11 #if defined(OS_WIN) | 12 #if defined(OS_WIN) |
| 12 | 13 |
| 13 class RefCountedMemory; | 14 class RefCountedMemory; |
| 14 | 15 |
| 15 // The Web UI handler for about:conflicts. | 16 // The Web UI handler for about:conflicts. |
| 16 class ConflictsUI : public WebUI { | 17 class ConflictsUI : public WebUI, public content::WebUIController { |
| 17 public: | 18 public: |
| 18 explicit ConflictsUI(content::WebContents* contents); | 19 explicit ConflictsUI(content::WebContents* contents); |
| 19 | 20 |
| 20 static RefCountedMemory* GetFaviconResourceBytes(); | 21 static RefCountedMemory* GetFaviconResourceBytes(); |
| 21 | 22 |
| 22 private: | 23 private: |
| 23 DISALLOW_COPY_AND_ASSIGN(ConflictsUI); | 24 DISALLOW_COPY_AND_ASSIGN(ConflictsUI); |
| 24 }; | 25 }; |
| 25 | 26 |
| 26 #endif | 27 #endif |
| 27 | 28 |
| 28 #endif // CHROME_BROWSER_UI_WEBUI_CONFLICTS_UI_H_ | 29 #endif // CHROME_BROWSER_UI_WEBUI_CONFLICTS_UI_H_ |
| OLD | NEW |