diff options
| author | jif@chromium.org <jif@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-17 17:20:53 +0000 |
|---|---|---|
| committer | jif@chromium.org <jif@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-17 17:20:53 +0000 |
| commit | 7627e0b44b3807ad604dc3b66170af723ddbfd99 (patch) | |
| tree | 57d154202cd77890e0eff91eb18b72777bfb40fc /chrome/browser/notifications/message_center_settings_controller.cc | |
| parent | ea8c56cdad5c7f8e2bf66ae7427dae786a8f82e5 (diff) | |
| download | chromium_src-7627e0b44b3807ad604dc3b66170af723ddbfd99.zip chromium_src-7627e0b44b3807ad604dc3b66170af723ddbfd99.tar.gz chromium_src-7627e0b44b3807ad604dc3b66170af723ddbfd99.tar.bz2 | |
Moved favicon_types to favicon_base component.
The move caused includes, DEPS, and gyp to change.
This CL also adds droger as a temporary owner to the favicon and favicon_base components.
Reasoning behind the creation of a favicon_base component:
Bookmarks and History code do not fundamentally depend on the Favicon code, so we should be able to build those components without building the Favicon code.
Deep inside the Bookmarks and History code base there's usage of certain favicon types. Those typedefs are moved to a separate component to break the dependency between the Bookmark/History components and the Favicon component.
BUG=362481
Review URL: https://codereview.chromium.org/234893002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@264555 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/notifications/message_center_settings_controller.cc')
| -rw-r--r-- | chrome/browser/notifications/message_center_settings_controller.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/notifications/message_center_settings_controller.cc b/chrome/browser/notifications/message_center_settings_controller.cc index c0a6022..9f1e26f 100644 --- a/chrome/browser/notifications/message_center_settings_controller.cc +++ b/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 @@ -422,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)); |