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

Side by Side Diff: chrome/browser/sync/sync_ui_util.cc

Issue 998413003: update new string (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 unified diff | Download patch
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/common/url_constants.h » ('j') | 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/sync/sync_ui_util.h" 5 #include "chrome/browser/sync/sync_ui_util.h"
6 6
7 #include "base/i18n/number_formatting.h" 7 #include "base/i18n/number_formatting.h"
8 #include "base/i18n/time_formatting.h" 8 #include "base/i18n/time_formatting.h"
9 #include "base/metrics/field_trial.h" 9 #include "base/metrics/field_trial.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 switch (style) { 92 switch (style) {
93 case PLAIN_TEXT: 93 case PLAIN_TEXT:
94 return l10n_util::GetStringFUTF16( 94 return l10n_util::GetStringFUTF16(
95 IDS_SYNC_ACCOUNT_SYNCING_TO_USER, 95 IDS_SYNC_ACCOUNT_SYNCING_TO_USER,
96 user_name); 96 user_name);
97 case WITH_HTML: 97 case WITH_HTML:
98 if (IsChromeDashboardEnabled()) { 98 if (IsChromeDashboardEnabled()) {
99 return l10n_util::GetStringFUTF16( 99 return l10n_util::GetStringFUTF16(
100 IDS_SYNC_ACCOUNT_SYNCING_TO_USER_WITH_MANAGE_LINK_NEW, 100 IDS_SYNC_ACCOUNT_SYNCING_TO_USER_WITH_MANAGE_LINK_NEW,
101 user_name, 101 user_name,
102 base::ASCIIToUTF16(chrome::kSyncChromeDashboardURL)); 102 base::ASCIIToUTF16(chrome::kSyncGoogleDashboardURL));
103 } 103 }
104 return l10n_util::GetStringFUTF16( 104 return l10n_util::GetStringFUTF16(
105 IDS_SYNC_ACCOUNT_SYNCING_TO_USER_WITH_MANAGE_LINK, 105 IDS_SYNC_ACCOUNT_SYNCING_TO_USER_WITH_MANAGE_LINK,
106 user_name, 106 user_name,
107 base::ASCIIToUTF16(chrome::kSyncGoogleDashboardURL)); 107 base::ASCIIToUTF16(chrome::kSyncGoogleDashboardURL));
108 default: 108 default:
109 NOTREACHED(); 109 NOTREACHED();
110 return NULL; 110 return NULL;
111 } 111 }
112 } 112 }
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
389 base::string16 ConstructTime(int64 time_in_int) { 389 base::string16 ConstructTime(int64 time_in_int) {
390 base::Time time = base::Time::FromInternalValue(time_in_int); 390 base::Time time = base::Time::FromInternalValue(time_in_int);
391 391
392 // If time is null the format function returns a time in 1969. 392 // If time is null the format function returns a time in 1969.
393 if (time.is_null()) 393 if (time.is_null())
394 return base::string16(); 394 return base::string16();
395 return base::TimeFormatFriendlyDateAndTime(time); 395 return base::TimeFormatFriendlyDateAndTime(time);
396 } 396 }
397 397
398 } // namespace sync_ui_util 398 } // namespace sync_ui_util
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/common/url_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698