| Index: chrome/browser/ui/webui/plugins/plugins_ui.cc
|
| diff --git a/chrome/browser/ui/webui/plugins/plugins_ui.cc b/chrome/browser/ui/webui/plugins/plugins_ui.cc
|
| index 7e1326d7dd837fc6d76870db33b5fc565d7e04e8..48efdbd9ac0239b5aa1010933b4f3202c8e6b15f 100644
|
| --- a/chrome/browser/ui/webui/plugins/plugins_ui.cc
|
| +++ b/chrome/browser/ui/webui/plugins/plugins_ui.cc
|
| @@ -69,25 +69,27 @@ content::WebUIDataSource* CreatePluginsUIHTMLSource(Profile* profile) {
|
| #if defined(OS_CHROMEOS)
|
| chromeos::AddAccountUITweaksLocalizedValues(source, profile);
|
| #endif
|
| + source->AddResourcePath("chrome/browser/ui/webui/plugins/plugins.mojom",
|
| + IDR_PLUGINS_MOJO_JS);
|
| +
|
| return source;
|
| }
|
|
|
| } // namespace
|
|
|
| -
|
| -PluginsUI::PluginsUI(content::WebUI* web_ui) : WebUIController(web_ui) {
|
| - web_ui->AddMessageHandler(new PluginsHandler());
|
| -
|
| +PluginsUI::PluginsUI(content::WebUI* web_ui) : MojoWebUIController(web_ui) {
|
| // Set up the chrome://plugins/ source.
|
| Profile* profile = Profile::FromWebUI(web_ui);
|
| content::WebUIDataSource::Add(profile, CreatePluginsUIHTMLSource(profile));
|
| }
|
|
|
| +PluginsUI::~PluginsUI() {}
|
| +
|
| // static
|
| base::RefCountedMemory* PluginsUI::GetFaviconResourceBytes(
|
| - ui::ScaleFactor scale_factor) {
|
| - return ResourceBundle::GetSharedInstance().
|
| - LoadDataResourceBytesForScale(IDR_PLUGINS_FAVICON, scale_factor);
|
| + ui::ScaleFactor scale_factor) {
|
| + return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale(
|
| + IDR_PLUGINS_FAVICON, scale_factor);
|
| }
|
|
|
| // static
|
| @@ -98,3 +100,8 @@ void PluginsUI::RegisterProfilePrefs(
|
| prefs::kContentSettingsPluginWhitelist,
|
| user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
|
| }
|
| +
|
| +void PluginsUI::BindUIHandler(
|
| + mojo::InterfaceRequest<PluginsHandlerMojo> request) {
|
| + plugins_handler_.reset(new PluginsHandler(web_ui(), std::move(request)));
|
| +}
|
|
|