| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/webui/md_history_ui.h" | 5 #include "chrome/browser/ui/webui/md_history_ui.h" |
| 6 | 6 |
| 7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
| 8 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
| 9 #include "chrome/browser/ui/webui/browsing_history_handler.h" | 9 #include "chrome/browser/ui/webui/browsing_history_handler.h" |
| 10 #include "chrome/browser/ui/webui/metrics_handler.h" | 10 #include "chrome/browser/ui/webui/metrics_handler.h" |
| 11 #include "chrome/common/url_constants.h" | 11 #include "chrome/common/url_constants.h" |
| 12 #include "components/search/search.h" | 12 #include "components/search/search.h" |
| 13 #include "content/public/browser/web_ui.h" | 13 #include "content/public/browser/web_ui.h" |
| 14 #include "content/public/browser/web_ui_data_source.h" | 14 #include "content/public/browser/web_ui_data_source.h" |
| 15 #include "grit/browser_resources.h" | 15 #include "grit/browser_resources.h" |
| 16 #include "grit/components_scaled_resources.h" | |
| 17 #include "grit/components_strings.h" | 16 #include "grit/components_strings.h" |
| 18 #include "grit/theme_resources.h" | 17 #include "grit/theme_resources.h" |
| 19 #include "ui/base/resource/resource_bundle.h" | 18 #include "ui/base/resource/resource_bundle.h" |
| 20 | 19 |
| 21 #if !defined(OS_ANDROID) | 20 #if !defined(OS_ANDROID) |
| 22 #include "chrome/browser/ui/webui/foreign_session_handler.h" | 21 #include "chrome/browser/ui/webui/foreign_session_handler.h" |
| 23 #include "chrome/browser/ui/webui/history_login_handler.h" | 22 #include "chrome/browser/ui/webui/history_login_handler.h" |
| 24 #endif | 23 #endif |
| 25 | 24 |
| 26 namespace { | 25 namespace { |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 content::WebUIDataSource::Add(profile, CreateMdHistoryUIHTMLSource()); | 57 content::WebUIDataSource::Add(profile, CreateMdHistoryUIHTMLSource()); |
| 59 } | 58 } |
| 60 | 59 |
| 61 MdHistoryUI::~MdHistoryUI() {} | 60 MdHistoryUI::~MdHistoryUI() {} |
| 62 | 61 |
| 63 base::RefCountedMemory* MdHistoryUI::GetFaviconResourceBytes( | 62 base::RefCountedMemory* MdHistoryUI::GetFaviconResourceBytes( |
| 64 ui::ScaleFactor scale_factor) { | 63 ui::ScaleFactor scale_factor) { |
| 65 return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( | 64 return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( |
| 66 IDR_HISTORY_FAVICON, scale_factor); | 65 IDR_HISTORY_FAVICON, scale_factor); |
| 67 } | 66 } |
| OLD | NEW |