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

Unified Diff: chrome/browser/ui/webui/history_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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/history_ui.h
===================================================================
--- chrome/browser/ui/webui/history_ui.h (revision 117871)
+++ chrome/browser/ui/webui/history_ui.h (working copy)
@@ -12,7 +12,6 @@
#include "chrome/browser/cancelable_request.h"
#include "chrome/browser/history/history.h"
#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
-#include "content/browser/webui/web_ui.h"
#include "content/public/browser/notification_registrar.h"
#include "content/public/browser/web_ui_controller.h"
#include "content/public/browser/web_ui_message_handler.h"
@@ -77,9 +76,9 @@
DISALLOW_COPY_AND_ASSIGN(BrowsingHistoryHandler);
};
-class HistoryUI : public WebUI, public content::WebUIController {
+class HistoryUI : public content::WebUIController {
public:
- explicit HistoryUI(content::WebContents* contents);
+ explicit HistoryUI(WebUI* web_ui);
// Return the URL for a given search term.
static const GURL GetHistoryURLWithSearchText(const string16& text);

Powered by Google App Engine
This is Rietveld 408576698