| 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 "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
| 9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
| 10 #include "chrome/browser/ui/webui/browsing_history_handler.h" | 10 #include "chrome/browser/ui/webui/browsing_history_handler.h" |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 source->AddResourcePath("history_item.js", IDR_MD_HISTORY_HISTORY_ITEM_JS); | 89 source->AddResourcePath("history_item.js", IDR_MD_HISTORY_HISTORY_ITEM_JS); |
| 90 source->AddResourcePath("history_list.html", | 90 source->AddResourcePath("history_list.html", |
| 91 IDR_MD_HISTORY_HISTORY_LIST_HTML); | 91 IDR_MD_HISTORY_HISTORY_LIST_HTML); |
| 92 source->AddResourcePath("history_list.js", IDR_MD_HISTORY_HISTORY_LIST_JS); | 92 source->AddResourcePath("history_list.js", IDR_MD_HISTORY_HISTORY_LIST_JS); |
| 93 source->AddResourcePath("history_toolbar.html", | 93 source->AddResourcePath("history_toolbar.html", |
| 94 IDR_MD_HISTORY_HISTORY_TOOLBAR_HTML); | 94 IDR_MD_HISTORY_HISTORY_TOOLBAR_HTML); |
| 95 source->AddResourcePath("history_toolbar.js", | 95 source->AddResourcePath("history_toolbar.js", |
| 96 IDR_MD_HISTORY_HISTORY_TOOLBAR_JS); | 96 IDR_MD_HISTORY_HISTORY_TOOLBAR_JS); |
| 97 source->AddResourcePath("history.js", IDR_MD_HISTORY_HISTORY_JS); | 97 source->AddResourcePath("history.js", IDR_MD_HISTORY_HISTORY_JS); |
| 98 source->AddResourcePath("icons.html", IDR_MD_HISTORY_ICONS_HTML); | 98 source->AddResourcePath("icons.html", IDR_MD_HISTORY_ICONS_HTML); |
| 99 source->AddResourcePath("list_container.html", |
| 100 IDR_MD_HISTORY_LIST_CONTAINER_HTML); |
| 101 source->AddResourcePath("list_container.js", |
| 102 IDR_MD_HISTORY_LIST_CONTAINER_JS); |
| 99 source->AddResourcePath("searched_label.html", | 103 source->AddResourcePath("searched_label.html", |
| 100 IDR_MD_HISTORY_SEARCHED_LABEL_HTML); | 104 IDR_MD_HISTORY_SEARCHED_LABEL_HTML); |
| 101 source->AddResourcePath("searched_label.js", | 105 source->AddResourcePath("searched_label.js", |
| 102 IDR_MD_HISTORY_SEARCHED_LABEL_JS); | 106 IDR_MD_HISTORY_SEARCHED_LABEL_JS); |
| 103 source->AddResourcePath("shared_style.html", | 107 source->AddResourcePath("shared_style.html", |
| 104 IDR_MD_HISTORY_SHARED_STYLE_HTML); | 108 IDR_MD_HISTORY_SHARED_STYLE_HTML); |
| 105 source->AddResourcePath("side_bar.html", IDR_MD_HISTORY_SIDE_BAR_HTML); | 109 source->AddResourcePath("side_bar.html", IDR_MD_HISTORY_SIDE_BAR_HTML); |
| 106 source->AddResourcePath("side_bar.js", IDR_MD_HISTORY_SIDE_BAR_JS); | 110 source->AddResourcePath("side_bar.js", IDR_MD_HISTORY_SIDE_BAR_JS); |
| 107 source->AddResourcePath("synced_device_card.html", | 111 source->AddResourcePath("synced_device_card.html", |
| 108 IDR_MD_HISTORY_SYNCED_DEVICE_CARD_HTML); | 112 IDR_MD_HISTORY_SYNCED_DEVICE_CARD_HTML); |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 153 base::FeatureList::ClearInstanceForTesting(); | 157 base::FeatureList::ClearInstanceForTesting(); |
| 154 base::FeatureList::SetInstance(std::move(feature_list)); | 158 base::FeatureList::SetInstance(std::move(feature_list)); |
| 155 } | 159 } |
| 156 | 160 |
| 157 // static | 161 // static |
| 158 base::RefCountedMemory* MdHistoryUI::GetFaviconResourceBytes( | 162 base::RefCountedMemory* MdHistoryUI::GetFaviconResourceBytes( |
| 159 ui::ScaleFactor scale_factor) { | 163 ui::ScaleFactor scale_factor) { |
| 160 return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( | 164 return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( |
| 161 IDR_HISTORY_FAVICON, scale_factor); | 165 IDR_HISTORY_FAVICON, scale_factor); |
| 162 } | 166 } |
| OLD | NEW |