Chromium Code Reviews| 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 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 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("shared_style.html", | 99 source->AddResourcePath("shared_style.html", |
| 100 IDR_MD_HISTORY_SHARED_STYLE_HTML); | 100 IDR_MD_HISTORY_SHARED_STYLE_HTML); |
| 101 source->AddResourcePath("searched_label.html", | |
|
tsergeant
2016/06/08 07:25:06
Nit: 'searched' before 'shared' here too
calamity
2016/06/14 01:51:45
Done.
| |
| 102 IDR_MD_HISTORY_SEARCHED_LABEL_HTML); | |
| 103 source->AddResourcePath("searched_label.js", | |
| 104 IDR_MD_HISTORY_SEARCHED_LABEL_JS); | |
| 101 source->AddResourcePath("side_bar.html", IDR_MD_HISTORY_SIDE_BAR_HTML); | 105 source->AddResourcePath("side_bar.html", IDR_MD_HISTORY_SIDE_BAR_HTML); |
| 102 source->AddResourcePath("side_bar.js", IDR_MD_HISTORY_SIDE_BAR_JS); | 106 source->AddResourcePath("side_bar.js", IDR_MD_HISTORY_SIDE_BAR_JS); |
| 103 source->AddResourcePath("synced_device_card.html", | 107 source->AddResourcePath("synced_device_card.html", |
| 104 IDR_MD_HISTORY_SYNCED_DEVICE_CARD_HTML); | 108 IDR_MD_HISTORY_SYNCED_DEVICE_CARD_HTML); |
| 105 source->AddResourcePath("synced_device_card.js", | 109 source->AddResourcePath("synced_device_card.js", |
| 106 IDR_MD_HISTORY_SYNCED_DEVICE_CARD_JS); | 110 IDR_MD_HISTORY_SYNCED_DEVICE_CARD_JS); |
| 107 source->AddResourcePath("synced_device_manager.html", | 111 source->AddResourcePath("synced_device_manager.html", |
| 108 IDR_MD_HISTORY_SYNCED_DEVICE_MANAGER_HTML); | 112 IDR_MD_HISTORY_SYNCED_DEVICE_MANAGER_HTML); |
| 109 source->AddResourcePath("synced_device_manager.js", | 113 source->AddResourcePath("synced_device_manager.js", |
| 110 IDR_MD_HISTORY_SYNCED_DEVICE_MANAGER_JS); | 114 IDR_MD_HISTORY_SYNCED_DEVICE_MANAGER_JS); |
| (...skipping 29 matching lines...) Expand all Loading... | |
| 140 switches::kHistoryEnableGroupByDomain) && | 144 switches::kHistoryEnableGroupByDomain) && |
| 141 !profile->IsSupervised(); | 145 !profile->IsSupervised(); |
| 142 } | 146 } |
| 143 | 147 |
| 144 // static | 148 // static |
| 145 base::RefCountedMemory* MdHistoryUI::GetFaviconResourceBytes( | 149 base::RefCountedMemory* MdHistoryUI::GetFaviconResourceBytes( |
| 146 ui::ScaleFactor scale_factor) { | 150 ui::ScaleFactor scale_factor) { |
| 147 return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( | 151 return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( |
| 148 IDR_HISTORY_FAVICON, scale_factor); | 152 IDR_HISTORY_FAVICON, scale_factor); |
| 149 } | 153 } |
| OLD | NEW |