chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc - Issue 9241032: Switch chrome code to use content::WebUI interface instead of WebUI concrete class. The latter wi...

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/chromeos/imageburner/imageburner_ui.cc

Issue 9241032: Switch chrome code to use content::WebUI interface instead of WebUI concrete class. The latter wi... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: 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

« chrome/browser/printing/print_dialog_cloud_internal.h ('K') | « chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.h ('k') | chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc

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

--- chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc (revision 117926)

+++ chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc (working copy)

@@ -20,9 +20,9 @@

#include "chrome/common/jstemplate_builder.h"

#include "chrome/common/time_format.h"

#include "chrome/common/url_constants.h"

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

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

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

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

#include "grit/browser_resources.h"

#include "grit/generated_resources.h"

#include "grit/locale_settings.h"

@@ -645,12 +645,12 @@

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

-ImageBurnUI::ImageBurnUI(WebUI* web_ui) : WebUIController(web_ui) {

- WebContents* contents = web_ui->web_contents();

- imageburner::WebUIHandler* handler = new imageburner::WebUIHandler(contents);

+ImageBurnUI::ImageBurnUI(content::WebUI* web_ui) : WebUIController(web_ui) {

+ imageburner::WebUIHandler* handler = new imageburner::WebUIHandler(

+ web_ui->GetWebContents());

web_ui->AddMessageHandler(handler);

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

+ Profile* profile = Profile::FromWebUI(web_ui);

profile->GetChromeURLDataManager()->AddDataSource(

CreateImageburnerUIHTMLSource());

}