chrome/browser/ui/webui/conflicts_ui.cc - 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/ui/webui/conflicts_ui.cc

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/ui/webui/conflicts_ui.h ('k') | chrome/browser/ui/webui/constrained_html_ui.h » ('j') | content/browser/tab_contents/render_view_host_manager_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/conflicts_ui.cc

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

--- chrome/browser/ui/webui/conflicts_ui.cc (revision 117871)

+++ chrome/browser/ui/webui/conflicts_ui.cc (working copy)

@@ -19,6 +19,7 @@

#include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"

#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/url_constants.h"

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

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

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

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

@@ -159,12 +160,13 @@

///////////////////////////////////////////////////////////////////////////////

-ConflictsUI::ConflictsUI(WebContents* contents) : WebUI(contents, this) {

+ConflictsUI::ConflictsUI(WebUI* web_ui) : WebUIController(web_ui) {

content::RecordAction(UserMetricsAction("ViewAboutConflicts"));

- AddMessageHandler(new ConflictsDOMHandler());

+ web_ui->AddMessageHandler(new ConflictsDOMHandler());

// Set up the about:conflicts source.

- Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext());

+ Profile* profile = Profile::FromBrowserContext(

+ web_ui->web_contents()->GetBrowserContext());

profile->GetChromeURLDataManager()->AddDataSource(

CreateConflictsUIHTMLSource());

}