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

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

Issue 7861013: Fix the false-positive detection of commit errors (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Another attempt at detecting errors Created 9 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) 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/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/string_util.h" 9 #include "base/string_util.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 if (user_name.empty()) 136 if (user_name.empty())
137 return label; 137 return label;
138 138
139 return l10n_util::GetStringFUTF16( 139 return l10n_util::GetStringFUTF16(
140 IDS_SYNC_ACCOUNT_SYNCING_TO_USER, 140 IDS_SYNC_ACCOUNT_SYNCING_TO_USER,
141 user_name, 141 user_name,
142 ASCIIToUTF16(chrome::kSyncGoogleDashboardURL)); 142 ASCIIToUTF16(chrome::kSyncGoogleDashboardURL));
143 } 143 }
144 144
145 void GetStatusForActionableError( 145 void GetStatusForActionableError(
146 const browser_sync::SyncProtocolError& error, 146 const browser_sync::SyncOperationResult& error,
147 string16* status_label) { 147 string16* status_label) {
148 DCHECK(status_label); 148 DCHECK(status_label);
149 switch (error.action) { 149 switch (error.action) {
150 case browser_sync::STOP_AND_RESTART_SYNC: 150 case browser_sync::STOP_AND_RESTART_SYNC:
151 status_label->assign( 151 status_label->assign(
152 l10n_util::GetStringUTF16(IDS_SYNC_STOP_AND_RESTART_SYNC)); 152 l10n_util::GetStringUTF16(IDS_SYNC_STOP_AND_RESTART_SYNC));
153 break; 153 break;
154 case browser_sync::UPGRADE_CLIENT: 154 case browser_sync::UPGRADE_CLIENT:
155 status_label->assign( 155 status_label->assign(
156 l10n_util::GetStringFUTF16(IDS_SYNC_UPGRADE_CLIENT, 156 l10n_util::GetStringFUTF16(IDS_SYNC_UPGRADE_CLIENT,
(...skipping 487 matching lines...) Expand 10 before | Expand all | Expand 10 after
644 DictionaryValue* val = new DictionaryValue; 644 DictionaryValue* val = new DictionaryValue;
645 val->SetString("model_type", ModelTypeToString(it->first)); 645 val->SetString("model_type", ModelTypeToString(it->first));
646 val->SetString("group", ModelSafeGroupToString(it->second)); 646 val->SetString("group", ModelSafeGroupToString(it->second));
647 routing_info->Append(val); 647 routing_info->Append(val);
648 } 648 }
649 } 649 }
650 } 650 }
651 } 651 }
652 652
653 } // namespace sync_ui_util 653 } // namespace sync_ui_util
OLDNEW
« no previous file with comments | « chrome/browser/sync/sessions/test_util.cc ('k') | chrome/browser/sync/test/integration/migration_errors_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698