Index: chrome/browser/sync/sync_ui_util.h |
diff --git a/chrome/browser/sync/sync_ui_util.h b/chrome/browser/sync/sync_ui_util.h |
index 223b89660ce15fc26f4c91cbe08fd7f515b57b80..98ab453f530148bc78d46db7dd3fd229614fc07a 100644 |
--- a/chrome/browser/sync/sync_ui_util.h |
+++ b/chrome/browser/sync/sync_ui_util.h |
@@ -9,9 +9,12 @@ |
#include "build/build_config.h" |
class Profile; |
-class ProfileSyncService; |
class SigninManagerBase; |
+namespace browser_sync { |
+class ProfileSyncService; |
+} // namespace browser_sync |
+ |
// Utility functions to gather current sync status information from the sync |
// service and constructs messages suitable for showing in UI. |
namespace sync_ui_util { |
@@ -47,7 +50,7 @@ enum AvatarSyncErrorType { |
// by querying |service|. |
// |style| sets the link properties, see |StatusLabelStyle|. |
MessageType GetStatusLabels(Profile* profile, |
- ProfileSyncService* service, |
+ browser_sync::ProfileSyncService* service, |
const SigninManagerBase& signin, |
StatusLabelStyle style, |
base::string16* status_label, |
@@ -55,20 +58,22 @@ MessageType GetStatusLabels(Profile* profile, |
// Same as above but for use specifically on the New Tab Page. |
// |status_label| may contain an HTML-formatted link. |
-MessageType GetStatusLabelsForNewTabPage(Profile* profile, |
- ProfileSyncService* service, |
- const SigninManagerBase& signin, |
- base::string16* status_label, |
- base::string16* link_label); |
+MessageType GetStatusLabelsForNewTabPage( |
+ Profile* profile, |
+ browser_sync::ProfileSyncService* service, |
+ const SigninManagerBase& signin, |
+ base::string16* status_label, |
+ base::string16* link_label); |
#if !defined(OS_CHROMEOS) |
// Gets various labels for the sync global error based on the sync error state. |
// |menu_item_label|, |bubble_message|, and |bubble_accept_label| must not be |
// NULL. Note that we don't use SyncGlobalError on Chrome OS. |
-void GetStatusLabelsForSyncGlobalError(const ProfileSyncService* service, |
- base::string16* menu_item_label, |
- base::string16* bubble_message, |
- base::string16* bubble_accept_label); |
+void GetStatusLabelsForSyncGlobalError( |
+ const browser_sync::ProfileSyncService* service, |
+ base::string16* menu_item_label, |
+ base::string16* bubble_message, |
+ base::string16* bubble_accept_label); |
// Gets the error message and button label for the sync errors that should be |
// exposed to the user through the titlebar avatar button. |
@@ -78,7 +83,7 @@ AvatarSyncErrorType GetMessagesForAvatarSyncError(Profile* profile, |
#endif |
MessageType GetStatus(Profile* profile, |
- ProfileSyncService* service, |
+ browser_sync::ProfileSyncService* service, |
const SigninManagerBase& signin); |
} // namespace sync_ui_util |