| 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 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 134 source->AddResourcePath("history_toolbar.html", | 134 source->AddResourcePath("history_toolbar.html", |
| 135 IDR_MD_HISTORY_HISTORY_TOOLBAR_HTML); | 135 IDR_MD_HISTORY_HISTORY_TOOLBAR_HTML); |
| 136 source->AddResourcePath("history_toolbar.js", | 136 source->AddResourcePath("history_toolbar.js", |
| 137 IDR_MD_HISTORY_HISTORY_TOOLBAR_JS); | 137 IDR_MD_HISTORY_HISTORY_TOOLBAR_JS); |
| 138 source->AddResourcePath("history.js", IDR_MD_HISTORY_HISTORY_JS); | 138 source->AddResourcePath("history.js", IDR_MD_HISTORY_HISTORY_JS); |
| 139 source->AddResourcePath("icons.html", IDR_MD_HISTORY_ICONS_HTML); | 139 source->AddResourcePath("icons.html", IDR_MD_HISTORY_ICONS_HTML); |
| 140 source->AddResourcePath("images/100/sign_in_promo.png", | 140 source->AddResourcePath("images/100/sign_in_promo.png", |
| 141 IDR_MD_HISTORY_IMAGES_100_SIGN_IN_PROMO_PNG); | 141 IDR_MD_HISTORY_IMAGES_100_SIGN_IN_PROMO_PNG); |
| 142 source->AddResourcePath("images/200/sign_in_promo.png", | 142 source->AddResourcePath("images/200/sign_in_promo.png", |
| 143 IDR_MD_HISTORY_IMAGES_200_SIGN_IN_PROMO_PNG); | 143 IDR_MD_HISTORY_IMAGES_200_SIGN_IN_PROMO_PNG); |
| 144 source->AddResourcePath("lazy_render.html", |
| 145 IDR_MD_HISTORY_LAZY_RENDER_HTML); |
| 146 source->AddResourcePath("lazy_render.js", |
| 147 IDR_MD_HISTORY_LAZY_RENDER_JS); |
| 144 source->AddResourcePath("list_container.html", | 148 source->AddResourcePath("list_container.html", |
| 145 IDR_MD_HISTORY_LIST_CONTAINER_HTML); | 149 IDR_MD_HISTORY_LIST_CONTAINER_HTML); |
| 146 source->AddResourcePath("list_container.js", | 150 source->AddResourcePath("list_container.js", |
| 147 IDR_MD_HISTORY_LIST_CONTAINER_JS); | 151 IDR_MD_HISTORY_LIST_CONTAINER_JS); |
| 148 source->AddResourcePath("searched_label.html", | 152 source->AddResourcePath("searched_label.html", |
| 149 IDR_MD_HISTORY_SEARCHED_LABEL_HTML); | 153 IDR_MD_HISTORY_SEARCHED_LABEL_HTML); |
| 150 source->AddResourcePath("searched_label.js", | 154 source->AddResourcePath("searched_label.js", |
| 151 IDR_MD_HISTORY_SEARCHED_LABEL_JS); | 155 IDR_MD_HISTORY_SEARCHED_LABEL_JS); |
| 152 source->AddResourcePath("shared_style.html", | 156 source->AddResourcePath("shared_style.html", |
| 153 IDR_MD_HISTORY_SHARED_STYLE_HTML); | 157 IDR_MD_HISTORY_SHARED_STYLE_HTML); |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 203 base::FeatureList::ClearInstanceForTesting(); | 207 base::FeatureList::ClearInstanceForTesting(); |
| 204 base::FeatureList::SetInstance(std::move(feature_list)); | 208 base::FeatureList::SetInstance(std::move(feature_list)); |
| 205 } | 209 } |
| 206 | 210 |
| 207 // static | 211 // static |
| 208 base::RefCountedMemory* MdHistoryUI::GetFaviconResourceBytes( | 212 base::RefCountedMemory* MdHistoryUI::GetFaviconResourceBytes( |
| 209 ui::ScaleFactor scale_factor) { | 213 ui::ScaleFactor scale_factor) { |
| 210 return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( | 214 return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( |
| 211 IDR_HISTORY_FAVICON, scale_factor); | 215 IDR_HISTORY_FAVICON, scale_factor); |
| 212 } | 216 } |
| OLD | NEW |