| Index: chrome/browser/ui/webui/popular_sites_internals_ui.cc
|
| diff --git a/chrome/browser/ui/webui/popular_sites_internals_ui.cc b/chrome/browser/ui/webui/popular_sites_internals_ui.cc
|
| index f6f0b64a453210ad775e90b21a42855b6935763d..4deae00232f494d30d6355b4a03758268c6fb982 100644
|
| --- a/chrome/browser/ui/webui/popular_sites_internals_ui.cc
|
| +++ b/chrome/browser/ui/webui/popular_sites_internals_ui.cc
|
| @@ -4,12 +4,79 @@
|
|
|
| #include "chrome/browser/ui/webui/popular_sites_internals_ui.h"
|
|
|
| +#include "chrome/browser/android/ntp/popular_sites.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| -#include "chrome/browser/ui/webui/popular_sites_internals_message_handler.h"
|
| #include "chrome/common/url_constants.h"
|
| -#include "chrome/grit/browser_resources.h"
|
| +#include "components/grit/components_resources.h"
|
| +#include "components/ntp_tiles/popular_sites.h"
|
| +#include "components/ntp_tiles/webui/popular_sites_internals_message_handler.h"
|
| +#include "components/ntp_tiles/webui/popular_sites_internals_message_handler_client.h"
|
| +#include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/web_ui.h"
|
| #include "content/public/browser/web_ui_data_source.h"
|
| +#include "content/public/browser/web_ui_message_handler.h"
|
| +
|
| +namespace {
|
| +
|
| +// The implementation for the chrome://popular-sites-internals page.
|
| +class ChromePopularSitesInternalsMessageHandlerBridge
|
| + : public content::WebUIMessageHandler,
|
| + public ntp_tiles::PopularSitesInternalsMessageHandlerClient {
|
| + public:
|
| + ChromePopularSitesInternalsMessageHandlerBridge() : handler_(this) {}
|
| +
|
| + private:
|
| + // content::WebUIMessageHandler:
|
| + void RegisterMessages() override;
|
| +
|
| + // ntp_tiles::PopularSitesInternalsMessageHandlerClient
|
| + base::SequencedWorkerPool* GetBlockingPool() override;
|
| + std::unique_ptr<ntp_tiles::PopularSites> MakePopularSites() override;
|
| + PrefService* GetPrefs() override;
|
| + void RegisterMessageCallback(
|
| + const std::string& message,
|
| + const base::Callback<void(const base::ListValue*)>& callback) override;
|
| + void CallJavascriptFunctionVector(
|
| + const std::string& name,
|
| + const std::vector<const base::Value*>& values) override;
|
| +
|
| + ntp_tiles::PopularSitesInternalsMessageHandler handler_;
|
| +
|
| + DISALLOW_COPY_AND_ASSIGN(ChromePopularSitesInternalsMessageHandlerBridge);
|
| +};
|
| +
|
| +void ChromePopularSitesInternalsMessageHandlerBridge::RegisterMessages() {
|
| + handler_.RegisterMessages();
|
| +}
|
| +
|
| +base::SequencedWorkerPool*
|
| +ChromePopularSitesInternalsMessageHandlerBridge::GetBlockingPool() {
|
| + return content::BrowserThread::GetBlockingPool();
|
| +}
|
| +
|
| +std::unique_ptr<ntp_tiles::PopularSites>
|
| +ChromePopularSitesInternalsMessageHandlerBridge::MakePopularSites() {
|
| + return ChromePopularSites::NewForProfile(Profile::FromWebUI(web_ui()));
|
| +}
|
| +
|
| +PrefService* ChromePopularSitesInternalsMessageHandlerBridge::GetPrefs() {
|
| + return Profile::FromWebUI(web_ui())->GetPrefs();
|
| +}
|
| +
|
| +void ChromePopularSitesInternalsMessageHandlerBridge::RegisterMessageCallback(
|
| + const std::string& message,
|
| + const base::Callback<void(const base::ListValue*)>& callback) {
|
| + web_ui()->RegisterMessageCallback(message, callback);
|
| +}
|
| +
|
| +void ChromePopularSitesInternalsMessageHandlerBridge::
|
| + CallJavascriptFunctionVector(
|
| + const std::string& name,
|
| + const std::vector<const base::Value*>& values) {
|
| + web_ui()->CallJavascriptFunctionUnsafe(name, values);
|
| +}
|
| +
|
| +} // namespace
|
|
|
| content::WebUIDataSource* CreatePopularSitesInternalsHTMLSource() {
|
| content::WebUIDataSource* source = content::WebUIDataSource::Create(
|
| @@ -20,17 +87,15 @@ content::WebUIDataSource* CreatePopularSitesInternalsHTMLSource() {
|
| source->AddResourcePath("popular_sites_internals.css",
|
| IDR_POPULAR_SITES_INTERNALS_CSS);
|
| source->SetDefaultResource(IDR_POPULAR_SITES_INTERNALS_HTML);
|
| - source->DisableI18nAndUseGzipForAllPaths();
|
| return source;
|
| }
|
|
|
| PopularSitesInternalsUI::PopularSitesInternalsUI(content::WebUI* web_ui)
|
| : WebUIController(web_ui) {
|
| - Profile* profile = Profile::FromWebUI(web_ui);
|
| - content::WebUIDataSource::Add(profile,
|
| + content::WebUIDataSource::Add(Profile::FromWebUI(web_ui),
|
| CreatePopularSitesInternalsHTMLSource());
|
| -
|
| - web_ui->AddMessageHandler(new PopularSitesInternalsMessageHandler);
|
| + web_ui->AddMessageHandler(
|
| + new ChromePopularSitesInternalsMessageHandlerBridge);
|
| }
|
|
|
| PopularSitesInternalsUI::~PopularSitesInternalsUI() {}
|
|
|