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

Side by Side Diff: chrome/browser/dom_ui/ntp_resource_cache.cc

Issue 3825005: Fix syncing of sessions. Numerous changes have been made. Currently, the mode... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Rebased again Created 10 years, 2 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/dom_ui/ntp_resource_cache.h" 5 #include "chrome/browser/dom_ui/ntp_resource_cache.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "app/animation.h" 10 #include "app/animation.h"
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 "true" : "false"); 238 "true" : "false");
239 localized_strings.SetString("apps", apps); 239 localized_strings.SetString("apps", apps);
240 localized_strings.SetString("title", title); 240 localized_strings.SetString("title", title);
241 localized_strings.SetString("mostvisited", most_visited); 241 localized_strings.SetString("mostvisited", most_visited);
242 localized_strings.SetString("restorethumbnails", 242 localized_strings.SetString("restorethumbnails",
243 l10n_util::GetStringUTF16(IDS_NEW_TAB_RESTORE_THUMBNAILS_LINK)); 243 l10n_util::GetStringUTF16(IDS_NEW_TAB_RESTORE_THUMBNAILS_LINK));
244 localized_strings.SetString("recentlyclosed", 244 localized_strings.SetString("recentlyclosed",
245 l10n_util::GetStringUTF16(IDS_NEW_TAB_RECENTLY_CLOSED)); 245 l10n_util::GetStringUTF16(IDS_NEW_TAB_RECENTLY_CLOSED));
246 localized_strings.SetString("closedwindowsingle", 246 localized_strings.SetString("closedwindowsingle",
247 l10n_util::GetStringUTF16(IDS_NEW_TAB_RECENTLY_CLOSED_WINDOW_SINGLE)); 247 l10n_util::GetStringUTF16(IDS_NEW_TAB_RECENTLY_CLOSED_WINDOW_SINGLE));
248 localized_strings.SetString("foreignsessions",
249 l10n_util::GetStringUTF16(IDS_SYNC_DATATYPE_SESSIONS));
248 localized_strings.SetString("closedwindowmultiple", 250 localized_strings.SetString("closedwindowmultiple",
249 l10n_util::GetStringUTF16(IDS_NEW_TAB_RECENTLY_CLOSED_WINDOW_MULTIPLE)); 251 l10n_util::GetStringUTF16(IDS_NEW_TAB_RECENTLY_CLOSED_WINDOW_MULTIPLE));
250 localized_strings.SetString("attributionintro", 252 localized_strings.SetString("attributionintro",
251 l10n_util::GetStringUTF16(IDS_NEW_TAB_ATTRIBUTION_INTRO)); 253 l10n_util::GetStringUTF16(IDS_NEW_TAB_ATTRIBUTION_INTRO));
252 localized_strings.SetString("thumbnailremovednotification", 254 localized_strings.SetString("thumbnailremovednotification",
253 l10n_util::GetStringUTF16(IDS_NEW_TAB_THUMBNAIL_REMOVED_NOTIFICATION)); 255 l10n_util::GetStringUTF16(IDS_NEW_TAB_THUMBNAIL_REMOVED_NOTIFICATION));
254 localized_strings.SetString("undothumbnailremove", 256 localized_strings.SetString("undothumbnailremove",
255 l10n_util::GetStringUTF16(IDS_NEW_TAB_UNDO_THUMBNAIL_REMOVE)); 257 l10n_util::GetStringUTF16(IDS_NEW_TAB_UNDO_THUMBNAIL_REMOVE));
256 localized_strings.SetString("removethumbnailtooltip", 258 localized_strings.SetString("removethumbnailtooltip",
257 l10n_util::GetStringUTF16(IDS_NEW_TAB_REMOVE_THUMBNAIL_TOOLTIP)); 259 l10n_util::GetStringUTF16(IDS_NEW_TAB_REMOVE_THUMBNAIL_TOOLTIP));
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
501 std::string css_string; 503 std::string css_string;
502 css_string = ReplaceStringPlaceholders(new_tab_theme_css, subst, NULL); 504 css_string = ReplaceStringPlaceholders(new_tab_theme_css, subst, NULL);
503 css_string = ReplaceStringPlaceholders(css_string, subst2, NULL); 505 css_string = ReplaceStringPlaceholders(css_string, subst2, NULL);
504 css_string = ReplaceStringPlaceholders(css_string, subst3, NULL); 506 css_string = ReplaceStringPlaceholders(css_string, subst3, NULL);
505 507
506 new_tab_css_ = new RefCountedBytes; 508 new_tab_css_ = new RefCountedBytes;
507 new_tab_css_->data.resize(css_string.size()); 509 new_tab_css_->data.resize(css_string.size());
508 std::copy(css_string.begin(), css_string.end(), 510 std::copy(css_string.begin(), css_string.end(),
509 new_tab_css_->data.begin()); 511 new_tab_css_->data.begin());
510 } 512 }
OLDNEW
« no previous file with comments | « chrome/browser/dom_ui/foreign_session_handler.cc ('k') | chrome/browser/dom_ui/options/sync_options_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698