Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(562)

Side by Side Diff: chrome/browser/ui/webui/conflicts_ui.h

Issue 9224002: Make WebUI objects not derive from WebUI. WebUI objects own the controller. This is the ownership... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync to head to clear linux_chromeos browsertest failures Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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"
10 #include "content/public/browser/web_ui_controller.h" 9 #include "content/public/browser/web_ui_controller.h"
11 10
12 #if defined(OS_WIN) 11 #if defined(OS_WIN)
13 12
14 class RefCountedMemory; 13 class RefCountedMemory;
15 14
16 // The Web UI handler for about:conflicts. 15 // The Web UI handler for about:conflicts.
17 class ConflictsUI : public WebUI, public content::WebUIController { 16 class ConflictsUI : public content::WebUIController {
18 public: 17 public:
19 explicit ConflictsUI(content::WebContents* contents); 18 explicit ConflictsUI(WebUI* web_ui);
20 19
21 static RefCountedMemory* GetFaviconResourceBytes(); 20 static RefCountedMemory* GetFaviconResourceBytes();
22 21
23 private: 22 private:
24 DISALLOW_COPY_AND_ASSIGN(ConflictsUI); 23 DISALLOW_COPY_AND_ASSIGN(ConflictsUI);
25 }; 24 };
26 25
27 #endif 26 #endif
28 27
29 #endif // CHROME_BROWSER_UI_WEBUI_CONFLICTS_UI_H_ 28 #endif // CHROME_BROWSER_UI_WEBUI_CONFLICTS_UI_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698