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

Unified Diff: chrome/browser/ui/webui/ntp_resource_cache.cc

Issue 6661024: Use a specialized new tab page in TOUCH_UI builds (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Fix some indentation issues and enable gjslist --strict mode to catch them automatically Created 9 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/resources/touch_ntp/trash-open.png ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/ntp_resource_cache.cc
diff --git a/chrome/browser/ui/webui/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp_resource_cache.cc
index a0ac1386100df7029b07579e180aeb648f03afcf..289f0f0ef82210b3c32406b3a81534daf7db3fb0 100644
--- a/chrome/browser/ui/webui/ntp_resource_cache.cc
+++ b/chrome/browser/ui/webui/ntp_resource_cache.cc
@@ -388,8 +388,13 @@ void NTPResourceCache::CreateNewTabHTML() {
std::string());
}
+ // Load the new tab page appropriate for this build
+ // Note that some builds (eg. TOUCHUI) don't make use of everything we
+ // do here (all of the template data, etc.), but we keep the back end
+ // consistent across builds, supporting the union of all NTP front-ends
+ // for simplicity.
base::StringPiece new_tab_html(ResourceBundle::GetSharedInstance().
- GetRawDataResource(IDR_NEW_NEW_TAB_HTML));
+ GetRawDataResource(IDR_NEW_TAB_HTML));
// Inject the template data into the HTML so that it is available before any
// layout is needed.
« no previous file with comments | « chrome/browser/resources/touch_ntp/trash-open.png ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698