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

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

Issue 2084843002: [MD History] Add history-list-container between app and history lists. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@tim_toolbar
Patch Set: rebase Created 4 years, 5 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 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 source->AddResourcePath("history_toolbar.html", 111 source->AddResourcePath("history_toolbar.html",
112 IDR_MD_HISTORY_HISTORY_TOOLBAR_HTML); 112 IDR_MD_HISTORY_HISTORY_TOOLBAR_HTML);
113 source->AddResourcePath("history_toolbar.js", 113 source->AddResourcePath("history_toolbar.js",
114 IDR_MD_HISTORY_HISTORY_TOOLBAR_JS); 114 IDR_MD_HISTORY_HISTORY_TOOLBAR_JS);
115 source->AddResourcePath("history.js", IDR_MD_HISTORY_HISTORY_JS); 115 source->AddResourcePath("history.js", IDR_MD_HISTORY_HISTORY_JS);
116 source->AddResourcePath("icons.html", IDR_MD_HISTORY_ICONS_HTML); 116 source->AddResourcePath("icons.html", IDR_MD_HISTORY_ICONS_HTML);
117 source->AddResourcePath("images/100/sign_in_promo.png", 117 source->AddResourcePath("images/100/sign_in_promo.png",
118 IDR_MD_HISTORY_IMAGES_100_SIGN_IN_PROMO_PNG); 118 IDR_MD_HISTORY_IMAGES_100_SIGN_IN_PROMO_PNG);
119 source->AddResourcePath("images/200/sign_in_promo.png", 119 source->AddResourcePath("images/200/sign_in_promo.png",
120 IDR_MD_HISTORY_IMAGES_200_SIGN_IN_PROMO_PNG); 120 IDR_MD_HISTORY_IMAGES_200_SIGN_IN_PROMO_PNG);
121 source->AddResourcePath("list_container.html",
122 IDR_MD_HISTORY_LIST_CONTAINER_HTML);
123 source->AddResourcePath("list_container.js",
124 IDR_MD_HISTORY_LIST_CONTAINER_JS);
121 source->AddResourcePath("searched_label.html", 125 source->AddResourcePath("searched_label.html",
122 IDR_MD_HISTORY_SEARCHED_LABEL_HTML); 126 IDR_MD_HISTORY_SEARCHED_LABEL_HTML);
123 source->AddResourcePath("searched_label.js", 127 source->AddResourcePath("searched_label.js",
124 IDR_MD_HISTORY_SEARCHED_LABEL_JS); 128 IDR_MD_HISTORY_SEARCHED_LABEL_JS);
125 source->AddResourcePath("shared_style.html", 129 source->AddResourcePath("shared_style.html",
126 IDR_MD_HISTORY_SHARED_STYLE_HTML); 130 IDR_MD_HISTORY_SHARED_STYLE_HTML);
127 source->AddResourcePath("side_bar.html", IDR_MD_HISTORY_SIDE_BAR_HTML); 131 source->AddResourcePath("side_bar.html", IDR_MD_HISTORY_SIDE_BAR_HTML);
128 source->AddResourcePath("side_bar.js", IDR_MD_HISTORY_SIDE_BAR_JS); 132 source->AddResourcePath("side_bar.js", IDR_MD_HISTORY_SIDE_BAR_JS);
129 source->AddResourcePath("synced_device_card.html", 133 source->AddResourcePath("synced_device_card.html",
130 IDR_MD_HISTORY_SYNCED_DEVICE_CARD_HTML); 134 IDR_MD_HISTORY_SYNCED_DEVICE_CARD_HTML);
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 base::FeatureList::ClearInstanceForTesting(); 181 base::FeatureList::ClearInstanceForTesting();
178 base::FeatureList::SetInstance(std::move(feature_list)); 182 base::FeatureList::SetInstance(std::move(feature_list));
179 } 183 }
180 184
181 // static 185 // static
182 base::RefCountedMemory* MdHistoryUI::GetFaviconResourceBytes( 186 base::RefCountedMemory* MdHistoryUI::GetFaviconResourceBytes(
183 ui::ScaleFactor scale_factor) { 187 ui::ScaleFactor scale_factor) {
184 return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( 188 return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale(
185 IDR_HISTORY_FAVICON, scale_factor); 189 IDR_HISTORY_FAVICON, scale_factor);
186 } 190 }
OLDNEW
« no previous file with comments | « chrome/browser/resources/md_history/side_bar.html ('k') | chrome/test/data/webui/md_history/history_grouped_list_test.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698