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

Unified Diff: chrome/browser/sync/sync_ui_util.cc

Issue 2354613002: [Sync] Fix namespaces for the browser_sync component. (Closed)
Patch Set: Address comments. Created 4 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sync/sync_ui_util.h ('k') | chrome/browser/sync/sync_ui_util_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/sync_ui_util.cc
diff --git a/chrome/browser/sync/sync_ui_util.cc b/chrome/browser/sync/sync_ui_util.cc
index ea18d8b78791dcb1f7293d0f177da94ad11085ff..3fa5fc5d4136ce2481581277aaecd13281103940 100644
--- a/chrome/browser/sync/sync_ui_util.cc
+++ b/chrome/browser/sync/sync_ui_util.cc
@@ -48,6 +48,8 @@
#include "components/sync/driver/sync_error_controller.h"
#endif // defined(OS_CHROMEOS)
+using browser_sync::ProfileSyncService;
+
typedef GoogleServiceAuthError AuthError;
namespace sync_ui_util {
@@ -176,7 +178,7 @@ MessageType GetStatusInfo(Profile* profile,
// otherwise show generic unrecoverable error message.
ProfileSyncService::Status status;
service->QueryDetailedSyncStatus(&status);
- if (ShouldShowActionOnUI(status.sync_protocol_error)) {
+ if (browser_sync::ShouldShowActionOnUI(status.sync_protocol_error)) {
GetStatusForActionableError(status.sync_protocol_error, status_label);
} else {
status_label->assign(l10n_util::GetStringFUTF16(
@@ -212,7 +214,7 @@ MessageType GetStatusInfo(Profile* profile,
// We don't have an auth error. Check for an actionable error.
ProfileSyncService::Status status;
service->QueryDetailedSyncStatus(&status);
- if (ShouldShowActionOnUI(status.sync_protocol_error)) {
+ if (browser_sync::ShouldShowActionOnUI(status.sync_protocol_error)) {
if (status_label) {
GetStatusForActionableError(status.sync_protocol_error,
status_label);
@@ -286,7 +288,7 @@ MessageType GetStatusInfo(Profile* profile,
result_type = SYNC_ERROR;
ProfileSyncService::Status status;
service->QueryDetailedSyncStatus(&status);
- if (ShouldShowActionOnUI(status.sync_protocol_error)) {
+ if (browser_sync::ShouldShowActionOnUI(status.sync_protocol_error)) {
if (status_label) {
GetStatusForActionableError(status.sync_protocol_error,
status_label);
« no previous file with comments | « chrome/browser/sync/sync_ui_util.h ('k') | chrome/browser/sync/sync_ui_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698