| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/notifications/message_center_settings_controller.h" | 5 #include "chrome/browser/notifications/message_center_settings_controller.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/i18n/string_compare.h" | 9 #include "base/i18n/string_compare.h" |
| 10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| 11 #include "chrome/browser/extensions/app_icon_loader_impl.h" | 11 #include "chrome/browser/extensions/app_icon_loader_impl.h" |
| 12 #include "chrome/browser/extensions/extension_service.h" | 12 #include "chrome/browser/extensions/extension_service.h" |
| 13 #include "chrome/browser/favicon/favicon_service.h" | 13 #include "chrome/browser/favicon/favicon_service.h" |
| 14 #include "chrome/browser/favicon/favicon_service_factory.h" | 14 #include "chrome/browser/favicon/favicon_service_factory.h" |
| 15 #include "chrome/browser/favicon/favicon_types.h" | 15 #include "chrome/browser/favicon/favicon_types.h" |
| 16 #include "chrome/browser/history/history_types.h" | 16 #include "chrome/browser/history/history_types.h" |
| 17 #include "chrome/browser/notifications/desktop_notification_service.h" | 17 #include "chrome/browser/notifications/desktop_notification_service.h" |
| 18 #include "chrome/browser/notifications/desktop_notification_service_factory.h" | 18 #include "chrome/browser/notifications/desktop_notification_service_factory.h" |
| 19 #include "chrome/browser/profiles/profile.h" | 19 #include "chrome/browser/profiles/profile.h" |
| 20 #include "chrome/browser/profiles/profile_manager.h" | 20 #include "chrome/browser/profiles/profile_manager.h" |
| 21 #include "chrome/common/cancelable_task_tracker.h" | 21 #include "chrome/common/cancelable_task_tracker.h" |
| 22 #include "chrome/common/extensions/extension_constants.h" | 22 #include "chrome/common/extensions/extension_constants.h" |
| 23 #include "chrome/common/favicon_types.h" |
| 23 #include "grit/theme_resources.h" | 24 #include "grit/theme_resources.h" |
| 24 #include "grit/ui_strings.h" | 25 #include "grit/ui_strings.h" |
| 25 #include "ui/base/l10n/l10n_util.h" | 26 #include "ui/base/l10n/l10n_util.h" |
| 26 #include "ui/base/resource/resource_bundle.h" | 27 #include "ui/base/resource/resource_bundle.h" |
| 27 #include "ui/gfx/image/image.h" | 28 #include "ui/gfx/image/image.h" |
| 28 #include "ui/message_center/message_center_style.h" | 29 #include "ui/message_center/message_center_style.h" |
| 29 | 30 |
| 30 using message_center::Notifier; | 31 using message_center::Notifier; |
| 31 | 32 |
| 32 namespace { | 33 namespace { |
| (...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 225 delegate_->UpdateFavicon(url, favicon_result.image); | 226 delegate_->UpdateFavicon(url, favicon_result.image); |
| 226 } | 227 } |
| 227 | 228 |
| 228 | 229 |
| 229 void MessageCenterSettingsController::SetAppImage(const std::string& id, | 230 void MessageCenterSettingsController::SetAppImage(const std::string& id, |
| 230 const gfx::ImageSkia& image) { | 231 const gfx::ImageSkia& image) { |
| 231 if (!delegate_) | 232 if (!delegate_) |
| 232 return; | 233 return; |
| 233 delegate_->UpdateIconImage(id, gfx::Image(image) ); | 234 delegate_->UpdateIconImage(id, gfx::Image(image) ); |
| 234 } | 235 } |
| OLD | NEW |