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

Unified Diff: chrome/browser/sync/glue/app_notification_data_type_controller.cc

Issue 10830036: Moved the AppNotification system into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Latest master for cq Created 8 years, 5 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
Index: chrome/browser/sync/glue/app_notification_data_type_controller.cc
diff --git a/chrome/browser/sync/glue/app_notification_data_type_controller.cc b/chrome/browser/sync/glue/app_notification_data_type_controller.cc
index c561177af3994b6769515d62a6cd6376b9885643..6b6d01e6bef9edea2090d9eeab53d7a3a6b3102c 100644
--- a/chrome/browser/sync/glue/app_notification_data_type_controller.cc
+++ b/chrome/browser/sync/glue/app_notification_data_type_controller.cc
@@ -42,21 +42,23 @@ void AppNotificationDataTypeController::Observe(
AppNotificationDataTypeController::~AppNotificationDataTypeController() {
}
-AppNotificationManager*
+extensions::AppNotificationManager*
AppNotificationDataTypeController::GetAppNotificationManager() {
return profile_->GetExtensionService()->app_notification_manager();
}
-// We want to start the AppNotificationManager before we begin associating.
+// We want to start the extensions::AppNotificationManager before we begin
+// associating.
bool AppNotificationDataTypeController::StartModels() {
- AppNotificationManager* manager = GetAppNotificationManager();
+ extensions::AppNotificationManager* manager = GetAppNotificationManager();
DCHECK(manager);
if (manager->loaded())
return true; // Continue to Associate().
- // Add an observer and continue when the AppNotificationManager is loaded.
+ // Add an observer and continue when the extensions::AppNotificationManager
+ // is loaded.
registrar_.Add(this, chrome::NOTIFICATION_APP_NOTIFICATION_MANAGER_LOADED,
- content::Source<AppNotificationManager>(manager));
+ content::Source<extensions::AppNotificationManager>(manager));
return false; // Don't continue Associate().
}

Powered by Google App Engine
This is Rietveld 408576698