Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / notifications / message_center_settings_controller.cc

diff --git a/src/chrome/browser/notifications/message_center_settings_controller.cc b/src/chrome/browser/notifications/message_center_settings_controller.cc
index de82030..d92a92e 100644 (file)
--- a/src/chrome/browser/notifications/message_center_settings_controller.cc
+++ b/src/chrome/browser/notifications/message_center_settings_controller.cc
@@ -28,7 +28,7 @@
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/extensions/api/notifications.h"
 #include "chrome/common/extensions/extension_constants.h"
-#include "chrome/common/favicon/favicon_types.h"
+#include "components/favicon_base/favicon_types.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "extensions/browser/event_router.h"
@@ -286,7 +286,7 @@ void MessageCenterSettingsController::GetNotifierList(
     patterns_[name] = iter->primary_pattern;
     FaviconService::FaviconForURLParams favicon_params(
         url,
-        chrome::FAVICON | chrome::TOUCH_ICON,
+        favicon_base::FAVICON | favicon_base::TOUCH_ICON,
         message_center::kSettingsIconSize);
     // Note that favicon service obtains the favicon from history. This means
     // that it will fail to obtain the image if there are no history data for
@@ -392,8 +392,7 @@ bool MessageCenterSettingsController::NotifierHasAdvancedSettings(
     return false;
   Profile* profile = notifier_groups_[current_notifier_group_]->profile();
 
-  extensions::EventRouter* event_router =
-      extensions::ExtensionSystem::Get(profile)->event_router();
+  extensions::EventRouter* event_router = extensions::EventRouter::Get(profile);
 
   return event_router->ExtensionHasEventListener(
       extension_id, extensions::api::notifications::OnShowSettings::kEventName);
@@ -413,8 +412,7 @@ void MessageCenterSettingsController::OnNotifierAdvancedSettingsRequested(
     return;
   Profile* profile = notifier_groups_[current_notifier_group_]->profile();
 
-  extensions::EventRouter* event_router =
-      extensions::ExtensionSystem::Get(profile)->event_router();
+  extensions::EventRouter* event_router = extensions::EventRouter::Get(profile);
   scoped_ptr<base::ListValue> args(new base::ListValue());
 
   scoped_ptr<extensions::Event> event(new extensions::Event(
@@ -424,7 +422,7 @@ void MessageCenterSettingsController::OnNotifierAdvancedSettingsRequested(
 
 void MessageCenterSettingsController::OnFaviconLoaded(
     const GURL& url,
-    const chrome::FaviconImageResult& favicon_result) {
+    const favicon_base::FaviconImageResult& favicon_result) {
   FOR_EACH_OBSERVER(message_center::NotifierSettingsObserver,
                     observers_,
                     UpdateIconImage(NotifierId(url), favicon_result.image));
@@ -477,12 +475,12 @@ void MessageCenterSettingsController::CreateNotifierGroupForGuestLogin() {
   chromeos::User* user = user_manager->GetActiveUser();
   Profile* profile = user_manager->GetProfileByUser(user);
   DCHECK(profile);
-  notifier_groups_.push_back(new message_center::ProfileNotifierGroup(
-      gfx::Image(user->image()),
-      user->GetDisplayName(),
-      user->GetDisplayName(),
-      0,
-      profile));
+  notifier_groups_.push_back(
+      new message_center::ProfileNotifierGroup(gfx::Image(user->GetImage()),
+                                               user->GetDisplayName(),
+                                               user->GetDisplayName(),
+                                               0,
+                                               profile));
 
   FOR_EACH_OBSERVER(message_center::NotifierSettingsObserver,
                     observers_,