Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(86)

Side by Side Diff: chrome/browser/ui/webui/md_history_ui.cc

Issue 2257703002: MD History: Improve test helpers, update synced tabs tests to use them (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revulcanize Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 source->AddResourcePath("list_container.html", 158 source->AddResourcePath("list_container.html",
159 IDR_MD_HISTORY_LIST_CONTAINER_HTML); 159 IDR_MD_HISTORY_LIST_CONTAINER_HTML);
160 source->AddResourcePath("list_container.js", 160 source->AddResourcePath("list_container.js",
161 IDR_MD_HISTORY_LIST_CONTAINER_JS); 161 IDR_MD_HISTORY_LIST_CONTAINER_JS);
162 source->AddResourcePath("searched_label.html", 162 source->AddResourcePath("searched_label.html",
163 IDR_MD_HISTORY_SEARCHED_LABEL_HTML); 163 IDR_MD_HISTORY_SEARCHED_LABEL_HTML);
164 source->AddResourcePath("searched_label.js", 164 source->AddResourcePath("searched_label.js",
165 IDR_MD_HISTORY_SEARCHED_LABEL_JS); 165 IDR_MD_HISTORY_SEARCHED_LABEL_JS);
166 source->AddResourcePath("shared_style.html", 166 source->AddResourcePath("shared_style.html",
167 IDR_MD_HISTORY_SHARED_STYLE_HTML); 167 IDR_MD_HISTORY_SHARED_STYLE_HTML);
168 source->AddResourcePath("shared_vars.html",
169 IDR_MD_HISTORY_SHARED_VARS_HTML);
168 source->AddResourcePath("side_bar.html", IDR_MD_HISTORY_SIDE_BAR_HTML); 170 source->AddResourcePath("side_bar.html", IDR_MD_HISTORY_SIDE_BAR_HTML);
169 source->AddResourcePath("side_bar.js", IDR_MD_HISTORY_SIDE_BAR_JS); 171 source->AddResourcePath("side_bar.js", IDR_MD_HISTORY_SIDE_BAR_JS);
170 source->AddResourcePath("synced_device_card.html", 172 source->AddResourcePath("synced_device_card.html",
171 IDR_MD_HISTORY_SYNCED_DEVICE_CARD_HTML); 173 IDR_MD_HISTORY_SYNCED_DEVICE_CARD_HTML);
172 source->AddResourcePath("synced_device_card.js", 174 source->AddResourcePath("synced_device_card.js",
173 IDR_MD_HISTORY_SYNCED_DEVICE_CARD_JS); 175 IDR_MD_HISTORY_SYNCED_DEVICE_CARD_JS);
174 source->AddResourcePath("synced_device_manager.html", 176 source->AddResourcePath("synced_device_manager.html",
175 IDR_MD_HISTORY_SYNCED_DEVICE_MANAGER_HTML); 177 IDR_MD_HISTORY_SYNCED_DEVICE_MANAGER_HTML);
176 source->AddResourcePath("synced_device_manager.js", 178 source->AddResourcePath("synced_device_manager.js",
177 IDR_MD_HISTORY_SYNCED_DEVICE_MANAGER_JS); 179 IDR_MD_HISTORY_SYNCED_DEVICE_MANAGER_JS);
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 base::FeatureList::ClearInstanceForTesting(); 218 base::FeatureList::ClearInstanceForTesting();
217 base::FeatureList::SetInstance(std::move(feature_list)); 219 base::FeatureList::SetInstance(std::move(feature_list));
218 } 220 }
219 221
220 // static 222 // static
221 base::RefCountedMemory* MdHistoryUI::GetFaviconResourceBytes( 223 base::RefCountedMemory* MdHistoryUI::GetFaviconResourceBytes(
222 ui::ScaleFactor scale_factor) { 224 ui::ScaleFactor scale_factor) {
223 return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( 225 return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale(
224 IDR_HISTORY_FAVICON, scale_factor); 226 IDR_HISTORY_FAVICON, scale_factor);
225 } 227 }
OLDNEW
« no previous file with comments | « chrome/browser/resources/md_history/shared_vars.html ('k') | chrome/test/data/webui/md_history/history_synced_tabs_test.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698