chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc - Issue 9481008: Move GenericHandler back to Chrome since it was really Chrome specific (i.e. chrome's mapping of cl…

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/chrome_web_ui_controller_factory.cc

Issue 9481008: Move GenericHandler back to Chrome since it was really Chrome specific (i.e. chrome's mapping of cl… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 8 years, 10 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/chrome_web_ui_controller_factory.cc

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

--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc (revision 123752)

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

@@ -26,6 +26,7 @@

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

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

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

+#include "chrome/browser/ui/webui/generic_handler.h"

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

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

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

@@ -404,12 +405,14 @@

content::WebUI* web_ui,

const GURL& url) const {

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

- WebUIFactoryFunction function = GetWebUIFactoryFunction(web_ui,

- profile, url);

+ WebUIFactoryFunction function = GetWebUIFactoryFunction(web_ui, profile, url);

if (!function)

return NULL;

- return (*function)(web_ui, url);

+ WebUIController* controller = (*function)(web_ui, url);

+ if (controller)

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

+ return controller;

}

void ChromeWebUIControllerFactory::GetFaviconForURL(

« no previous file with comments | « chrome/browser/ui/views/event_utils.cc ('k') | chrome/browser/ui/webui/generic_handler.h » ('j') | no next file with comments »