| 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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 source->AddResourcePath("constants.js", IDR_MD_HISTORY_CONSTANTS_JS); | 119 source->AddResourcePath("constants.js", IDR_MD_HISTORY_CONSTANTS_JS); |
| 120 source->AddResourcePath("grouped_list.html", | 120 source->AddResourcePath("grouped_list.html", |
| 121 IDR_MD_HISTORY_GROUPED_LIST_HTML); | 121 IDR_MD_HISTORY_GROUPED_LIST_HTML); |
| 122 source->AddResourcePath("grouped_list.js", IDR_MD_HISTORY_GROUPED_LIST_JS); | 122 source->AddResourcePath("grouped_list.js", IDR_MD_HISTORY_GROUPED_LIST_JS); |
| 123 source->AddResourcePath("history_item.html", | 123 source->AddResourcePath("history_item.html", |
| 124 IDR_MD_HISTORY_HISTORY_ITEM_HTML); | 124 IDR_MD_HISTORY_HISTORY_ITEM_HTML); |
| 125 source->AddResourcePath("history_item.js", IDR_MD_HISTORY_HISTORY_ITEM_JS); | 125 source->AddResourcePath("history_item.js", IDR_MD_HISTORY_HISTORY_ITEM_JS); |
| 126 source->AddResourcePath("history_list.html", | 126 source->AddResourcePath("history_list.html", |
| 127 IDR_MD_HISTORY_HISTORY_LIST_HTML); | 127 IDR_MD_HISTORY_HISTORY_LIST_HTML); |
| 128 source->AddResourcePath("history_list.js", IDR_MD_HISTORY_HISTORY_LIST_JS); | 128 source->AddResourcePath("history_list.js", IDR_MD_HISTORY_HISTORY_LIST_JS); |
| 129 source->AddResourcePath("history_list_behavior.html", |
| 130 IDR_MD_HISTORY_HISTORY_LIST_BEHAVIOR_HTML); |
| 131 source->AddResourcePath("history_list_behavior.js", |
| 132 IDR_MD_HISTORY_HISTORY_LIST_BEHAVIOR_JS); |
| 129 source->AddResourcePath("history_toolbar.html", | 133 source->AddResourcePath("history_toolbar.html", |
| 130 IDR_MD_HISTORY_HISTORY_TOOLBAR_HTML); | 134 IDR_MD_HISTORY_HISTORY_TOOLBAR_HTML); |
| 131 source->AddResourcePath("history_toolbar.js", | 135 source->AddResourcePath("history_toolbar.js", |
| 132 IDR_MD_HISTORY_HISTORY_TOOLBAR_JS); | 136 IDR_MD_HISTORY_HISTORY_TOOLBAR_JS); |
| 133 source->AddResourcePath("history.js", IDR_MD_HISTORY_HISTORY_JS); | 137 source->AddResourcePath("history.js", IDR_MD_HISTORY_HISTORY_JS); |
| 134 source->AddResourcePath("icons.html", IDR_MD_HISTORY_ICONS_HTML); | 138 source->AddResourcePath("icons.html", IDR_MD_HISTORY_ICONS_HTML); |
| 135 source->AddResourcePath("images/100/sign_in_promo.png", | 139 source->AddResourcePath("images/100/sign_in_promo.png", |
| 136 IDR_MD_HISTORY_IMAGES_100_SIGN_IN_PROMO_PNG); | 140 IDR_MD_HISTORY_IMAGES_100_SIGN_IN_PROMO_PNG); |
| 137 source->AddResourcePath("images/200/sign_in_promo.png", | 141 source->AddResourcePath("images/200/sign_in_promo.png", |
| 138 IDR_MD_HISTORY_IMAGES_200_SIGN_IN_PROMO_PNG); | 142 IDR_MD_HISTORY_IMAGES_200_SIGN_IN_PROMO_PNG); |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 199 base::FeatureList::ClearInstanceForTesting(); | 203 base::FeatureList::ClearInstanceForTesting(); |
| 200 base::FeatureList::SetInstance(std::move(feature_list)); | 204 base::FeatureList::SetInstance(std::move(feature_list)); |
| 201 } | 205 } |
| 202 | 206 |
| 203 // static | 207 // static |
| 204 base::RefCountedMemory* MdHistoryUI::GetFaviconResourceBytes( | 208 base::RefCountedMemory* MdHistoryUI::GetFaviconResourceBytes( |
| 205 ui::ScaleFactor scale_factor) { | 209 ui::ScaleFactor scale_factor) { |
| 206 return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( | 210 return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( |
| 207 IDR_HISTORY_FAVICON, scale_factor); | 211 IDR_HISTORY_FAVICON, scale_factor); |
| 208 } | 212 } |
| OLD | NEW |