chrome/browser/extensions/extension_web_ui.h - Issue 9224002: Make WebUI objects not derive from WebUI. WebUI objects own the controller. This is the ownership...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/extension_web_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

« no previous file with comments | « chrome/browser/download/save_page_browsertest.cc ('k') | chrome/browser/extensions/extension_web_ui.cc » ('j') | content/browser/tab_contents/render_view_host_manager_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_web_ui.h

===================================================================

--- chrome/browser/extensions/extension_web_ui.h (revision 117871)

+++ chrome/browser/extensions/extension_web_ui.h (working copy)

@@ -12,7 +12,6 @@

#include "chrome/browser/bookmarks/bookmark_manager_extension_api.h"

#include "chrome/browser/favicon/favicon_service.h"

#include "chrome/common/extensions/extension.h"

-#include "content/browser/webui/web_ui.h"

#include "content/public/browser/web_ui_controller.h"

class PrefService;

@@ -22,11 +21,11 @@

// the main tab contents area. For example, each extension can specify an

// "options_page", and that page is displayed in the tab contents area and is

// hosted by this class.

-class ExtensionWebUI : public WebUI, public content::WebUIController {

+class ExtensionWebUI : public content::WebUIController {

public:

static const char kExtensionURLOverrides[];

- ExtensionWebUI(content::WebContents* web_contents, const GURL& url);

+ ExtensionWebUI(WebUI* web_ui, const GURL& url);

virtual ~ExtensionWebUI();