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

Side by Side Diff: chrome/browser/ui/webui/ntp/ntp_resource_cache.cc

Issue 7701013: [ntp4] Limit the maximum bookmark tiles that will display at once, for now. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: code review changes; rebase Created 9 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/resources/ntp4/bookmarks_page.js ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/ntp/ntp_resource_cache.h" 5 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 localized_strings.SetString("web_store_url", 354 localized_strings.SetString("web_store_url",
355 GetUrlWithLang(GURL(extension_urls::GetWebstoreLaunchURL()))); 355 GetUrlWithLang(GURL(extension_urls::GetWebstoreLaunchURL())));
356 localized_strings.SetString("syncpromotext", 356 localized_strings.SetString("syncpromotext",
357 l10n_util::GetStringUTF16(IDS_SYNC_START_SYNC_BUTTON_LABEL)); 357 l10n_util::GetStringUTF16(IDS_SYNC_START_SYNC_BUTTON_LABEL));
358 localized_strings.SetString("syncLinkText", 358 localized_strings.SetString("syncLinkText",
359 l10n_util::GetStringUTF16(IDS_SYNC_ADVANCED_OPTIONS)); 359 l10n_util::GetStringUTF16(IDS_SYNC_ADVANCED_OPTIONS));
360 localized_strings.SetString("trashLabel", 360 localized_strings.SetString("trashLabel",
361 l10n_util::GetStringFUTF16( 361 l10n_util::GetStringFUTF16(
362 IDS_NEW_TAB_TRASH_LABEL, 362 IDS_NEW_TAB_TRASH_LABEL,
363 l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME))); 363 l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME)));
364 localized_strings.SetString("bookmarksManagerLinkTitle",
365 l10n_util::GetStringUTF16(IDS_NEW_TAB_BOOKMARKS_MANAGER_LINK_TITLE));
364 #if defined(OS_CHROMEOS) 366 #if defined(OS_CHROMEOS)
365 localized_strings.SetString("expandMenu", 367 localized_strings.SetString("expandMenu",
366 l10n_util::GetStringUTF16(IDS_NEW_TAB_CLOSE_MENU_EXPAND)); 368 l10n_util::GetStringUTF16(IDS_NEW_TAB_CLOSE_MENU_EXPAND));
367 #endif 369 #endif
368 370
369 NewTabPageHandler::GetLocalizedValues(profile_, &localized_strings); 371 NewTabPageHandler::GetLocalizedValues(profile_, &localized_strings);
370 372
371 SyncSetupHandler::GetStaticLocalizedValues(&localized_strings); 373 SyncSetupHandler::GetStaticLocalizedValues(&localized_strings);
372 374
373 // Don't initiate the sync related message passing with the page if the sync 375 // Don't initiate the sync related message passing with the page if the sync
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
611 IDR_NEW_TAB_4_THEME_CSS : IDR_NEW_TAB_THEME_CSS; 613 IDR_NEW_TAB_4_THEME_CSS : IDR_NEW_TAB_THEME_CSS;
612 static const base::StringPiece new_tab_theme_css( 614 static const base::StringPiece new_tab_theme_css(
613 ResourceBundle::GetSharedInstance().GetRawDataResource( 615 ResourceBundle::GetSharedInstance().GetRawDataResource(
614 ntp_css_resource_id)); 616 ntp_css_resource_id));
615 617
616 // Create the string from our template and the replacements. 618 // Create the string from our template and the replacements.
617 std::string css_string; 619 std::string css_string;
618 css_string = ReplaceStringPlaceholders(new_tab_theme_css, subst, NULL); 620 css_string = ReplaceStringPlaceholders(new_tab_theme_css, subst, NULL);
619 new_tab_css_ = base::RefCountedString::TakeString(&css_string); 621 new_tab_css_ = base::RefCountedString::TakeString(&css_string);
620 } 622 }
OLDNEW
« no previous file with comments | « chrome/browser/resources/ntp4/bookmarks_page.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698