| 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/signin/signin_manager_factory.h" | 10 #include "chrome/browser/signin/signin_manager_factory.h" |
| (...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 152 source->AddResourcePath("history_list.js", IDR_MD_HISTORY_HISTORY_LIST_JS); | 152 source->AddResourcePath("history_list.js", IDR_MD_HISTORY_HISTORY_LIST_JS); |
| 153 source->AddResourcePath("history_list_behavior.html", | 153 source->AddResourcePath("history_list_behavior.html", |
| 154 IDR_MD_HISTORY_HISTORY_LIST_BEHAVIOR_HTML); | 154 IDR_MD_HISTORY_HISTORY_LIST_BEHAVIOR_HTML); |
| 155 source->AddResourcePath("history_list_behavior.js", | 155 source->AddResourcePath("history_list_behavior.js", |
| 156 IDR_MD_HISTORY_HISTORY_LIST_BEHAVIOR_JS); | 156 IDR_MD_HISTORY_HISTORY_LIST_BEHAVIOR_JS); |
| 157 source->AddResourcePath("history_toolbar.html", | 157 source->AddResourcePath("history_toolbar.html", |
| 158 IDR_MD_HISTORY_HISTORY_TOOLBAR_HTML); | 158 IDR_MD_HISTORY_HISTORY_TOOLBAR_HTML); |
| 159 source->AddResourcePath("history_toolbar.js", | 159 source->AddResourcePath("history_toolbar.js", |
| 160 IDR_MD_HISTORY_HISTORY_TOOLBAR_JS); | 160 IDR_MD_HISTORY_HISTORY_TOOLBAR_JS); |
| 161 source->AddResourcePath("icons.html", IDR_MD_HISTORY_ICONS_HTML); | 161 source->AddResourcePath("icons.html", IDR_MD_HISTORY_ICONS_HTML); |
| 162 source->AddResourcePath("lazy_render.html", | |
| 163 IDR_MD_HISTORY_LAZY_RENDER_HTML); | |
| 164 source->AddResourcePath("lazy_render.js", | |
| 165 IDR_MD_HISTORY_LAZY_RENDER_JS); | |
| 166 source->AddResourcePath("list_container.html", | 162 source->AddResourcePath("list_container.html", |
| 167 IDR_MD_HISTORY_LIST_CONTAINER_HTML); | 163 IDR_MD_HISTORY_LIST_CONTAINER_HTML); |
| 168 source->AddResourcePath("list_container.js", | 164 source->AddResourcePath("list_container.js", |
| 169 IDR_MD_HISTORY_LIST_CONTAINER_JS); | 165 IDR_MD_HISTORY_LIST_CONTAINER_JS); |
| 170 source->AddResourcePath("searched_label.html", | 166 source->AddResourcePath("searched_label.html", |
| 171 IDR_MD_HISTORY_SEARCHED_LABEL_HTML); | 167 IDR_MD_HISTORY_SEARCHED_LABEL_HTML); |
| 172 source->AddResourcePath("searched_label.js", | 168 source->AddResourcePath("searched_label.js", |
| 173 IDR_MD_HISTORY_SEARCHED_LABEL_JS); | 169 IDR_MD_HISTORY_SEARCHED_LABEL_JS); |
| 174 source->AddResourcePath("shared_style.html", | 170 source->AddResourcePath("shared_style.html", |
| 175 IDR_MD_HISTORY_SHARED_STYLE_HTML); | 171 IDR_MD_HISTORY_SHARED_STYLE_HTML); |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 228 base::FeatureList::ClearInstanceForTesting(); | 224 base::FeatureList::ClearInstanceForTesting(); |
| 229 base::FeatureList::SetInstance(std::move(feature_list)); | 225 base::FeatureList::SetInstance(std::move(feature_list)); |
| 230 } | 226 } |
| 231 | 227 |
| 232 // static | 228 // static |
| 233 base::RefCountedMemory* MdHistoryUI::GetFaviconResourceBytes( | 229 base::RefCountedMemory* MdHistoryUI::GetFaviconResourceBytes( |
| 234 ui::ScaleFactor scale_factor) { | 230 ui::ScaleFactor scale_factor) { |
| 235 return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( | 231 return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( |
| 236 IDR_HISTORY_FAVICON, scale_factor); | 232 IDR_HISTORY_FAVICON, scale_factor); |
| 237 } | 233 } |
| OLD | NEW |