Chromium Code Reviews| Index: chrome/browser/ui/webui/history_ui.cc |
| diff --git a/chrome/browser/ui/webui/history_ui.cc b/chrome/browser/ui/webui/history_ui.cc |
| index af647cee1d892e757c1c8f857a9cdca3b71c29c7..806cbe8e50d7d3b3be0a955935e2a994cab1074e 100644 |
| --- a/chrome/browser/ui/webui/history_ui.cc |
| +++ b/chrome/browser/ui/webui/history_ui.cc |
| @@ -176,11 +176,15 @@ HistoryUI::HistoryUI(content::WebUI* web_ui) : WebUIController(web_ui) { |
| web_ui->AddMessageHandler(new BrowsingHistoryHandler()); |
| web_ui->AddMessageHandler(new MetricsHandler()); |
| + // Set up the chrome://history-frame/ source. |
| + CreateDataSource(); |
|
calamity
2016/09/30 04:09:49
May as well move this back to where it was. I'm va
lshang
2016/09/30 04:53:51
Yeah it makes sense. Done.
|
| + |
| // On mobile we deal with foreign sessions differently. |
| #if !defined(OS_ANDROID) |
| if (search::IsInstantExtendedAPIEnabled()) { |
| web_ui->AddMessageHandler(new browser_sync::ForeignSessionHandler()); |
| - web_ui->AddMessageHandler(new HistoryLoginHandler()); |
| + web_ui->AddMessageHandler(new HistoryLoginHandler( |
| + base::Bind(&HistoryUI::CreateDataSource, base::Unretained(this)))); |
| } |
| #endif |
| @@ -197,10 +201,6 @@ HistoryUI::HistoryUI(content::WebUI* web_ui) : WebUIController(web_ui) { |
| browsing_data::testing:: |
| g_override_other_forms_of_browsing_history_query = true; |
| } |
| - |
| - // Set up the chrome://history-frame/ source. |
| - Profile* profile = Profile::FromWebUI(web_ui); |
| - content::WebUIDataSource::Add(profile, CreateHistoryUIHTMLSource(profile)); |
| } |
| HistoryUI::~HistoryUI() {} |
| @@ -211,3 +211,11 @@ base::RefCountedMemory* HistoryUI::GetFaviconResourceBytes( |
| return ResourceBundle::GetSharedInstance(). |
| LoadDataResourceBytesForScale(IDR_HISTORY_FAVICON, scale_factor); |
| } |
| + |
| +// TODO(lshang): Change to not re-create data source every time after we use |
| +// unique_ptr instead of raw pointers for data source. |
| +void HistoryUI::CreateDataSource() { |
| + Profile* profile = Profile::FromWebUI(web_ui()); |
| + content::WebUIDataSource* data_source = CreateHistoryUIHTMLSource(profile); |
| + content::WebUIDataSource::Add(profile, data_source); |
| +} |