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

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

Issue 2352293002: MD History: Replace app-route with a custom router (Closed)
Patch Set: More minor cleanup Created 4 years, 3 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 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 source->AddResourcePath("history_item.html", 147 source->AddResourcePath("history_item.html",
148 IDR_MD_HISTORY_HISTORY_ITEM_HTML); 148 IDR_MD_HISTORY_HISTORY_ITEM_HTML);
149 source->AddResourcePath("history_item.js", IDR_MD_HISTORY_HISTORY_ITEM_JS); 149 source->AddResourcePath("history_item.js", IDR_MD_HISTORY_HISTORY_ITEM_JS);
150 source->AddResourcePath("history_list.html", 150 source->AddResourcePath("history_list.html",
151 IDR_MD_HISTORY_HISTORY_LIST_HTML); 151 IDR_MD_HISTORY_HISTORY_LIST_HTML);
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_router.html",
158 IDR_MD_HISTORY_HISTORY_ROUTER_HTML);
159 source->AddResourcePath("history_router.js",
160 IDR_MD_HISTORY_HISTORY_ROUTER_JS);
157 source->AddResourcePath("history_toolbar.html", 161 source->AddResourcePath("history_toolbar.html",
158 IDR_MD_HISTORY_HISTORY_TOOLBAR_HTML); 162 IDR_MD_HISTORY_HISTORY_TOOLBAR_HTML);
159 source->AddResourcePath("history_toolbar.js", 163 source->AddResourcePath("history_toolbar.js",
160 IDR_MD_HISTORY_HISTORY_TOOLBAR_JS); 164 IDR_MD_HISTORY_HISTORY_TOOLBAR_JS);
161 source->AddResourcePath("icons.html", IDR_MD_HISTORY_ICONS_HTML); 165 source->AddResourcePath("icons.html", IDR_MD_HISTORY_ICONS_HTML);
162 source->AddResourcePath("list_container.html", 166 source->AddResourcePath("list_container.html",
163 IDR_MD_HISTORY_LIST_CONTAINER_HTML); 167 IDR_MD_HISTORY_LIST_CONTAINER_HTML);
164 source->AddResourcePath("list_container.js", 168 source->AddResourcePath("list_container.js",
165 IDR_MD_HISTORY_LIST_CONTAINER_JS); 169 IDR_MD_HISTORY_LIST_CONTAINER_JS);
166 source->AddResourcePath("searched_label.html", 170 source->AddResourcePath("searched_label.html",
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 base::FeatureList::ClearInstanceForTesting(); 228 base::FeatureList::ClearInstanceForTesting();
225 base::FeatureList::SetInstance(std::move(feature_list)); 229 base::FeatureList::SetInstance(std::move(feature_list));
226 } 230 }
227 231
228 // static 232 // static
229 base::RefCountedMemory* MdHistoryUI::GetFaviconResourceBytes( 233 base::RefCountedMemory* MdHistoryUI::GetFaviconResourceBytes(
230 ui::ScaleFactor scale_factor) { 234 ui::ScaleFactor scale_factor) {
231 return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( 235 return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale(
232 IDR_HISTORY_FAVICON, scale_factor); 236 IDR_HISTORY_FAVICON, scale_factor);
233 } 237 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698