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

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

Issue 7669052: Added DataTypeController integration and UI surfacing for syncing Search Engines. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: TODO comment in ProfileImpl 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
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 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 localized_strings.SetString("bookmarksPage", 293 localized_strings.SetString("bookmarksPage",
294 l10n_util::GetStringUTF16(IDS_NEW_TAB_BOOKMARKS_PAGE_TITLE)); 294 l10n_util::GetStringUTF16(IDS_NEW_TAB_BOOKMARKS_PAGE_TITLE));
295 localized_strings.SetString("restorethumbnails", 295 localized_strings.SetString("restorethumbnails",
296 l10n_util::GetStringUTF16(IDS_NEW_TAB_RESTORE_THUMBNAILS_LINK)); 296 l10n_util::GetStringUTF16(IDS_NEW_TAB_RESTORE_THUMBNAILS_LINK));
297 localized_strings.SetString("restoreThumbnailsShort", 297 localized_strings.SetString("restoreThumbnailsShort",
298 l10n_util::GetStringUTF16(IDS_NEW_TAB_RESTORE_THUMBNAILS_SHORT_LINK)); 298 l10n_util::GetStringUTF16(IDS_NEW_TAB_RESTORE_THUMBNAILS_SHORT_LINK));
299 localized_strings.SetString("recentlyclosed", 299 localized_strings.SetString("recentlyclosed",
300 l10n_util::GetStringUTF16(IDS_NEW_TAB_RECENTLY_CLOSED)); 300 l10n_util::GetStringUTF16(IDS_NEW_TAB_RECENTLY_CLOSED));
301 localized_strings.SetString("closedwindowsingle", 301 localized_strings.SetString("closedwindowsingle",
302 l10n_util::GetStringUTF16(IDS_NEW_TAB_RECENTLY_CLOSED_WINDOW_SINGLE)); 302 l10n_util::GetStringUTF16(IDS_NEW_TAB_RECENTLY_CLOSED_WINDOW_SINGLE));
303 localized_strings.SetString("searchengines",
304 l10n_util::GetStringUTF16(IDS_SYNC_DATATYPE_SEARCH_ENGINES));
Sheridan Rawlins 2011/08/25 08:19:16 Does this change need to be made to NTP4 as well?
SteveT 2011/08/25 14:50:55 Is there a separate setup for NTP4? I didn't find
303 localized_strings.SetString("foreignsessions", 305 localized_strings.SetString("foreignsessions",
304 l10n_util::GetStringUTF16(IDS_SYNC_DATATYPE_SESSIONS)); 306 l10n_util::GetStringUTF16(IDS_SYNC_DATATYPE_SESSIONS));
305 localized_strings.SetString("closedwindowmultiple", 307 localized_strings.SetString("closedwindowmultiple",
306 l10n_util::GetStringUTF16(IDS_NEW_TAB_RECENTLY_CLOSED_WINDOW_MULTIPLE)); 308 l10n_util::GetStringUTF16(IDS_NEW_TAB_RECENTLY_CLOSED_WINDOW_MULTIPLE));
307 localized_strings.SetString("attributionintro", 309 localized_strings.SetString("attributionintro",
308 l10n_util::GetStringUTF16(IDS_NEW_TAB_ATTRIBUTION_INTRO)); 310 l10n_util::GetStringUTF16(IDS_NEW_TAB_ATTRIBUTION_INTRO));
309 localized_strings.SetString("thumbnailremovednotification", 311 localized_strings.SetString("thumbnailremovednotification",
310 l10n_util::GetStringUTF16(IDS_NEW_TAB_THUMBNAIL_REMOVED_NOTIFICATION)); 312 l10n_util::GetStringUTF16(IDS_NEW_TAB_THUMBNAIL_REMOVED_NOTIFICATION));
311 localized_strings.SetString("undothumbnailremove", 313 localized_strings.SetString("undothumbnailremove",
312 l10n_util::GetStringUTF16(IDS_NEW_TAB_UNDO_THUMBNAIL_REMOVE)); 314 l10n_util::GetStringUTF16(IDS_NEW_TAB_UNDO_THUMBNAIL_REMOVE));
(...skipping 298 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

Powered by Google App Engine
This is Rietveld 408576698