Index: chrome/browser/BUILD.gn |
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn |
index aab62b00c25f744edc8f32a25134587cc23305e4..eed55d4193ebebef992f81255176f714173bc8d6 100644 |
--- a/chrome/browser/BUILD.gn |
+++ b/chrome/browser/BUILD.gn |
@@ -692,6 +692,46 @@ split_static_library("browser") { |
"net/timed_cache.h", |
"net/url_info.cc", |
"net/url_info.h", |
+ "notifications/alert_dispatcher_mac.h", |
+ "notifications/desktop_notification_profile_util.cc", |
+ "notifications/desktop_notification_profile_util.h", |
+ "notifications/login_state_notification_blocker_chromeos.cc", |
+ "notifications/login_state_notification_blocker_chromeos.h", |
+ "notifications/message_center_display_service.cc", |
+ "notifications/message_center_display_service.h", |
+ "notifications/native_notification_display_service.cc", |
+ "notifications/native_notification_display_service.h", |
+ "notifications/non_persistent_notification_handler.cc", |
+ "notifications/non_persistent_notification_handler.h", |
+ "notifications/notification.cc", |
+ "notifications/notification.h", |
+ "notifications/notification_common.cc", |
+ "notifications/notification_common.h", |
+ "notifications/notification_delegate.h", |
+ "notifications/notification_display_service.h", |
+ "notifications/notification_display_service_factory.cc", |
+ "notifications/notification_display_service_factory.h", |
+ "notifications/notification_handler.h", |
+ "notifications/notification_object_proxy.cc", |
+ "notifications/notification_object_proxy.h", |
+ "notifications/notification_permission_context.cc", |
+ "notifications/notification_permission_context.h", |
+ "notifications/notification_platform_bridge.h", |
+ "notifications/notification_platform_bridge_mac.h", |
+ "notifications/notification_platform_bridge_mac.mm", |
+ "notifications/notification_ui_manager.h", |
+ "notifications/notifier_state_tracker.cc", |
+ "notifications/notifier_state_tracker.h", |
+ "notifications/notifier_state_tracker_factory.cc", |
+ "notifications/notifier_state_tracker_factory.h", |
+ "notifications/persistent_notification_delegate.cc", |
+ "notifications/persistent_notification_delegate.h", |
+ "notifications/persistent_notification_handler.cc", |
+ "notifications/persistent_notification_handler.h", |
+ "notifications/platform_notification_service_impl.cc", |
+ "notifications/platform_notification_service_impl.h", |
+ "notifications/web_notification_delegate.cc", |
+ "notifications/web_notification_delegate.h", |
"ntp_snippets/bookmark_last_visit_updater.cc", |
"ntp_snippets/bookmark_last_visit_updater.h", |
"ntp_snippets/content_suggestions_service_factory.cc", |
@@ -984,6 +1024,8 @@ split_static_library("browser") { |
"push_messaging/push_messaging_app_identifier.h", |
"push_messaging/push_messaging_constants.cc", |
"push_messaging/push_messaging_constants.h", |
+ "push_messaging/push_messaging_notification_manager.cc", |
+ "push_messaging/push_messaging_notification_manager.h", |
"push_messaging/push_messaging_service_factory.cc", |
"push_messaging/push_messaging_service_factory.h", |
"push_messaging/push_messaging_service_impl.cc", |
@@ -2306,98 +2348,6 @@ split_static_library("browser") { |
sources -= [ "net/nss_context_linux.cc" ] |
} |
} |
- if (enable_notifications) { |
- sources += [ |
- "notifications/alert_dispatcher_mac.h", |
- "notifications/desktop_notification_profile_util.cc", |
- "notifications/desktop_notification_profile_util.h", |
- "notifications/login_state_notification_blocker_chromeos.cc", |
- "notifications/login_state_notification_blocker_chromeos.h", |
- "notifications/message_center_display_service.cc", |
- "notifications/message_center_display_service.h", |
- "notifications/native_notification_display_service.cc", |
- "notifications/native_notification_display_service.h", |
- "notifications/non_persistent_notification_handler.cc", |
- "notifications/non_persistent_notification_handler.h", |
- "notifications/notification.cc", |
- "notifications/notification.h", |
- "notifications/notification_common.cc", |
- "notifications/notification_common.h", |
- "notifications/notification_delegate.h", |
- "notifications/notification_display_service.h", |
- "notifications/notification_display_service_factory.cc", |
- "notifications/notification_display_service_factory.h", |
- "notifications/notification_handler.h", |
- "notifications/notification_object_proxy.cc", |
- "notifications/notification_object_proxy.h", |
- "notifications/notification_permission_context.cc", |
- "notifications/notification_permission_context.h", |
- "notifications/notification_platform_bridge.h", |
- "notifications/notification_platform_bridge_mac.h", |
- "notifications/notification_platform_bridge_mac.mm", |
- "notifications/notification_ui_manager.h", |
- "notifications/notifier_state_tracker.cc", |
- "notifications/notifier_state_tracker.h", |
- "notifications/notifier_state_tracker_factory.cc", |
- "notifications/notifier_state_tracker_factory.h", |
- "notifications/persistent_notification_delegate.cc", |
- "notifications/persistent_notification_delegate.h", |
- "notifications/persistent_notification_handler.cc", |
- "notifications/persistent_notification_handler.h", |
- "notifications/platform_notification_service_impl.cc", |
- "notifications/platform_notification_service_impl.h", |
- "notifications/web_notification_delegate.cc", |
- "notifications/web_notification_delegate.h", |
- "push_messaging/push_messaging_notification_manager.cc", |
- "push_messaging/push_messaging_notification_manager.h", |
- ] |
- if (android_java_ui) { |
- sources += [ |
- "notifications/notification_permission_infobar_delegate.cc", |
- "notifications/notification_permission_infobar_delegate.h", |
- "notifications/notification_platform_bridge_android.cc", |
- "notifications/notification_platform_bridge_android.h", |
- ] |
- } else { |
- sources += [ |
- "notifications/application_notifier_source.cc", |
- "notifications/application_notifier_source.h", |
- "notifications/arc_application_notifier_source_chromeos.cc", |
- "notifications/arc_application_notifier_source_chromeos.h", |
- "notifications/extension_welcome_notification.cc", |
- "notifications/extension_welcome_notification.h", |
- "notifications/extension_welcome_notification_factory.cc", |
- "notifications/extension_welcome_notification_factory.h", |
- "notifications/fullscreen_notification_blocker.cc", |
- "notifications/fullscreen_notification_blocker.h", |
- "notifications/google_now_notification_stats_collector.cc", |
- "notifications/google_now_notification_stats_collector.h", |
- "notifications/message_center_notification_manager.cc", |
- "notifications/message_center_notification_manager.h", |
- "notifications/message_center_settings_controller.cc", |
- "notifications/message_center_settings_controller.h", |
- "notifications/message_center_stats_collector.cc", |
- "notifications/message_center_stats_collector.h", |
- "notifications/notification_conversion_helper.cc", |
- "notifications/notification_conversion_helper.h", |
- "notifications/notification_system_observer.cc", |
- "notifications/notification_system_observer.h", |
- "notifications/notification_ui_manager_desktop.cc", |
- "notifications/notifier_source.h", |
- "notifications/profile_notification.cc", |
- "notifications/profile_notification.h", |
- "notifications/screen_lock_notification_blocker.cc", |
- "notifications/screen_lock_notification_blocker.h", |
- "notifications/system_component_notifier_source_chromeos.cc", |
- "notifications/system_component_notifier_source_chromeos.h", |
- "notifications/web_page_notifier_source.cc", |
- "notifications/web_page_notifier_source.h", |
- ] |
- } |
- if (is_mac) { |
- deps += [ "//chrome/browser/ui/cocoa/notifications:common" ] |
- } |
- } |
if (enable_themes) { |
sources += [ |
"sync/glue/theme_data_type_controller.cc", |
@@ -3350,6 +3300,10 @@ split_static_library("browser") { |
"net/spdyproxy/data_reduction_promo_infobar_delegate_android.h", |
"net/spdyproxy/data_reduction_proxy_settings_android.cc", |
"net/spdyproxy/data_reduction_proxy_settings_android.h", |
+ "notifications/notification_permission_infobar_delegate.cc", |
+ "notifications/notification_permission_infobar_delegate.h", |
+ "notifications/notification_platform_bridge_android.cc", |
+ "notifications/notification_platform_bridge_android.h", |
"page_load_metrics/observers/android_page_load_metrics_observer.cc", |
"page_load_metrics/observers/android_page_load_metrics_observer.h", |
"password_manager/account_chooser_dialog_android.cc", |
@@ -3439,6 +3393,42 @@ split_static_library("browser") { |
"android/offline_pages/evaluation/offline_page_evaluation_bridge.h", |
] |
} |
+ } else { |
+ # ! android_java_ui |
+ sources += [ |
+ "notifications/application_notifier_source.cc", |
+ "notifications/application_notifier_source.h", |
+ "notifications/arc_application_notifier_source_chromeos.cc", |
+ "notifications/arc_application_notifier_source_chromeos.h", |
+ "notifications/extension_welcome_notification.cc", |
+ "notifications/extension_welcome_notification.h", |
+ "notifications/extension_welcome_notification_factory.cc", |
+ "notifications/extension_welcome_notification_factory.h", |
+ "notifications/fullscreen_notification_blocker.cc", |
+ "notifications/fullscreen_notification_blocker.h", |
+ "notifications/google_now_notification_stats_collector.cc", |
+ "notifications/google_now_notification_stats_collector.h", |
+ "notifications/message_center_notification_manager.cc", |
+ "notifications/message_center_notification_manager.h", |
+ "notifications/message_center_settings_controller.cc", |
+ "notifications/message_center_settings_controller.h", |
+ "notifications/message_center_stats_collector.cc", |
+ "notifications/message_center_stats_collector.h", |
+ "notifications/notification_conversion_helper.cc", |
+ "notifications/notification_conversion_helper.h", |
+ "notifications/notification_system_observer.cc", |
+ "notifications/notification_system_observer.h", |
+ "notifications/notification_ui_manager_desktop.cc", |
+ "notifications/notifier_source.h", |
+ "notifications/profile_notification.cc", |
+ "notifications/profile_notification.h", |
+ "notifications/screen_lock_notification_blocker.cc", |
+ "notifications/screen_lock_notification_blocker.h", |
+ "notifications/system_component_notifier_source_chromeos.cc", |
+ "notifications/system_component_notifier_source_chromeos.h", |
+ "notifications/web_page_notifier_source.cc", |
+ "notifications/web_page_notifier_source.h", |
+ ] |
} |
if (enable_vr_shell || enable_webvr) { |
@@ -3454,6 +3444,7 @@ split_static_library("browser") { |
deps += [ |
"//chrome/app_shim", |
"//chrome/browser/apps/app_shim", |
+ "//chrome/browser/ui/cocoa/notifications:common", |
"//third_party/crashpad/crashpad/client:client", |
"//third_party/google_toolbox_for_mac", |
"//third_party/mozilla", |