Index: chrome/chrome_browser.gypi |
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi |
index 58357d194378f134a8313d1bd7c4e93c24977883..ea84ca6c8c23b76c6cece0f3da524a833fd7cdcb 100644 |
--- a/chrome/chrome_browser.gypi |
+++ b/chrome/chrome_browser.gypi |
@@ -594,10 +594,10 @@ |
'browser/push_messaging/push_messaging_permission_context.h', |
'browser/push_messaging/push_messaging_permission_context_factory.cc', |
'browser/push_messaging/push_messaging_permission_context_factory.h', |
+ 'browser/push_messaging/push_messaging_service_factory.cc', |
+ 'browser/push_messaging/push_messaging_service_factory.h', |
'browser/push_messaging/push_messaging_service_impl.cc', |
'browser/push_messaging/push_messaging_service_impl.h', |
- 'browser/push_messaging/push_messaging_service_factory.h', |
- 'browser/push_messaging/push_messaging_service_factory.cc', |
'browser/renderer_context_menu/context_menu_content_type_factory.cc', |
'browser/renderer_context_menu/context_menu_content_type_factory.h', |
'browser/renderer_context_menu/context_menu_content_type_panel.cc', |
@@ -900,10 +900,10 @@ |
'browser/download/download_shelf.h', |
'browser/download/download_shelf_context_menu.cc', |
'browser/download/download_shelf_context_menu.h', |
- 'browser/download/notification/download_notification_item.h', |
'browser/download/notification/download_notification_item.cc', |
- 'browser/download/notification/download_notification_manager.h', |
+ 'browser/download/notification/download_notification_item.h', |
'browser/download/notification/download_notification_manager.cc', |
+ 'browser/download/notification/download_notification_manager.h', |
'browser/external_protocol/external_protocol_observer.cc', |
'browser/external_protocol/external_protocol_observer.h', |
'browser/feedback/feedback_profile_observer.cc', |
@@ -1531,15 +1531,10 @@ |
'browser/favicon/chrome_favicon_client.h', |
'browser/favicon/chrome_favicon_client_factory.cc', |
'browser/favicon/chrome_favicon_client_factory.h', |
- 'browser/favicon/favicon_handler.cc', |
- 'browser/favicon/favicon_handler.h', |
- 'browser/favicon/favicon_service.cc', |
- 'browser/favicon/favicon_service.h', |
'browser/favicon/favicon_service_factory.cc', |
'browser/favicon/favicon_service_factory.h', |
'browser/favicon/favicon_tab_helper.cc', |
'browser/favicon/favicon_tab_helper.h', |
- 'browser/favicon/favicon_tab_helper_observer.h', |
], |
'chrome_browser_gnome_keyring_sources': [ |
'browser/password_manager/native_backend_gnome_x.cc', |
@@ -2928,7 +2923,7 @@ |
'../components/components.gyp:domain_reliability', |
'../components/components.gyp:enhanced_bookmarks', |
'../components/components.gyp:favicon_base', |
- '../components/components.gyp:favicon_core', |
+ '../components/components.gyp:favicon_core_browser', |
'../components/components.gyp:feedback_component', |
'../components/components.gyp:gcm_driver', |
'../components/components.gyp:google_core_browser', |