diff options
54 files changed, 77 insertions, 68 deletions
diff --git a/chrome/browser/autofill/personal_data_manager_unittest.cc b/chrome/browser/autofill/personal_data_manager_unittest.cc index f993970..a8e31dc 100644 --- a/chrome/browser/autofill/personal_data_manager_unittest.cc +++ b/chrome/browser/autofill/personal_data_manager_unittest.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <string> + #include "base/basictypes.h" #include "base/message_loop.h" #include "base/ref_counted.h" @@ -18,7 +20,7 @@ #include "chrome/common/notification_details.h" #include "chrome/common/notification_observer_mock.h" #include "chrome/common/notification_registrar.h" -#include "chrome/common/notification_service.h" +#include "chrome/common/notification_source.h" #include "chrome/common/notification_type.h" #include "chrome/common/pref_names.h" #include "chrome/test/testing_profile.h" diff --git a/chrome/browser/bookmarks/bookmark_model_unittest.cc b/chrome/browser/bookmarks/bookmark_model_unittest.cc index 6d6017a..ef486fb 100644 --- a/chrome/browser/bookmarks/bookmark_model_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_model_unittest.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <string> #include <set> #include "app/tree_node_iterator.h" @@ -22,8 +23,9 @@ #include "chrome/browser/history/history_notifications.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" +#include "chrome/common/notification_details.h" #include "chrome/common/notification_registrar.h" -#include "chrome/common/notification_service.h" +#include "chrome/common/notification_source.h" #include "chrome/test/model_test_utils.h" #include "chrome/test/testing_profile.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/browser_main_mac.mm b/chrome/browser/browser_main_mac.mm index 2af66cb4..98629ba 100644 --- a/chrome/browser/browser_main_mac.mm +++ b/chrome/browser/browser_main_mac.mm @@ -25,7 +25,6 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/main_function_params.h" -#include "chrome/common/notification_service.h" #include "chrome/common/result_codes.h" #include "net/socket/ssl_client_socket_mac_factory.h" diff --git a/chrome/browser/chromeos/cros_settings.cc b/chrome/browser/chromeos/cros_settings.cc index d5cbe6b..59cdb4d 100644 --- a/chrome/browser/chromeos/cros_settings.cc +++ b/chrome/browser/chromeos/cros_settings.cc @@ -9,7 +9,9 @@ #include "base/values.h" #include "chrome/browser/chromeos/cros_settings_provider.h" #include "chrome/browser/chromeos/user_cros_settings_provider.h" -#include "chrome/common/notification_service.h" +#include "chrome/common/notification_details.h" +#include "chrome/common/notification_source.h" +#include "chrome/common/notification_type.h" namespace chromeos { @@ -142,7 +144,7 @@ void CrosSettings::RemoveSettingsObserver(const char* path, CrosSettingsProvider* CrosSettings::GetProvider( const std::string& path) const { for (size_t i = 0; i < providers_.size(); ++i) { - if (providers_[i]->HandlesSetting(path)){ + if (providers_[i]->HandlesSetting(path)) { return providers_[i]; } } diff --git a/chrome/browser/chromeos/dom_ui/core_chromeos_options_handler.cc b/chrome/browser/chromeos/dom_ui/core_chromeos_options_handler.cc index d76e33d..43d1148 100644 --- a/chrome/browser/chromeos/dom_ui/core_chromeos_options_handler.cc +++ b/chrome/browser/chromeos/dom_ui/core_chromeos_options_handler.cc @@ -4,11 +4,14 @@ #include "chrome/browser/chromeos/dom_ui/core_chromeos_options_handler.h" +#include <string> + #include "base/json/json_reader.h" #include "base/string_number_conversions.h" #include "chrome/browser/chromeos/cros_settings.h" #include "chrome/browser/metrics/user_metrics.h" -#include "chrome/common/notification_service.h" +#include "chrome/common/notification_details.h" +#include "chrome/common/notification_source.h" namespace chromeos { diff --git a/chrome/browser/chromeos/dom_ui/internet_options_handler.cc b/chrome/browser/chromeos/dom_ui/internet_options_handler.cc index 0c31379..1b37cea 100644 --- a/chrome/browser/chromeos/dom_ui/internet_options_handler.cc +++ b/chrome/browser/chromeos/dom_ui/internet_options_handler.cc @@ -28,7 +28,6 @@ #include "chrome/browser/dom_ui/dom_ui_util.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/views/window.h" -#include "chrome/common/notification_service.h" #include "chrome/common/time_format.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/chromeos/dom_ui/proxy_handler.cc b/chrome/browser/chromeos/dom_ui/proxy_handler.cc index 7a196f8..759d8bd 100644 --- a/chrome/browser/chromeos/dom_ui/proxy_handler.cc +++ b/chrome/browser/chromeos/dom_ui/proxy_handler.cc @@ -13,7 +13,6 @@ #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/chromeos/proxy_cros_settings_provider.h" -#include "chrome/common/notification_service.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" @@ -69,4 +68,4 @@ void ProxyHandler::GetLocalizedValues( l10n_util::GetStringUTF16(IDS_PROXY_BYPASS)); } -} // namespace chromeos +} // namespace chromeos diff --git a/chrome/browser/chromeos/dom_ui/system_options_handler.cc b/chrome/browser/chromeos/dom_ui/system_options_handler.cc index d47c82c..d543871 100644 --- a/chrome/browser/chromeos/dom_ui/system_options_handler.cc +++ b/chrome/browser/chromeos/dom_ui/system_options_handler.cc @@ -14,7 +14,6 @@ #include "base/values.h" #include "chrome/browser/chromeos/dom_ui/system_settings_provider.h" #include "chrome/browser/chromeos/language_preferences.h" -#include "chrome/common/notification_service.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/chromeos/login/login_screen.cc b/chrome/browser/chromeos/login/login_screen.cc index c26a552..5270b5b 100644 --- a/chrome/browser/chromeos/login/login_screen.cc +++ b/chrome/browser/chromeos/login/login_screen.cc @@ -23,7 +23,6 @@ #include "chrome/browser/chromeos/login/screen_observer.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" -#include "chrome/common/notification_service.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/chromeos/login/wizard_accessibility_handler.cc b/chrome/browser/chromeos/login/wizard_accessibility_handler.cc index 57328ab..ab24214 100644 --- a/chrome/browser/chromeos/login/wizard_accessibility_handler.cc +++ b/chrome/browser/chromeos/login/wizard_accessibility_handler.cc @@ -17,8 +17,9 @@ #include "chrome/browser/extensions/extension_accessibility_api.h" #include "chrome/browser/extensions/extension_accessibility_api_constants.h" #include "chrome/browser/profiles/profile_manager.h" +#include "chrome/common/notification_details.h" #include "chrome/common/notification_registrar.h" -#include "chrome/common/notification_service.h" +#include "chrome/common/notification_source.h" #include "grit/generated_resources.h" namespace keys = extension_accessibility_api_constants; diff --git a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc index 9bf0618..7d8121b 100644 --- a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc +++ b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc @@ -15,7 +15,6 @@ #include "chrome/browser/chromeos/login/wizard_controller.h" #include "chrome/browser/chromeos/login/wizard_in_process_browser_test.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/notification_service.h" #include "chrome/test/ui_test_utils.h" #include "grit/generated_resources.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/chromeos/offline/offline_load_service.cc b/chrome/browser/chromeos/offline/offline_load_service.cc index ace85d8..c7738c9 100644 --- a/chrome/browser/chromeos/offline/offline_load_service.cc +++ b/chrome/browser/chromeos/offline/offline_load_service.cc @@ -10,7 +10,8 @@ #include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_util.h" -#include "chrome/common/notification_service.h" +#include "chrome/common/notification_details.h" +#include "chrome/common/notification_source.h" namespace chromeos { diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc index 2127aee..0f57dae 100644 --- a/chrome/browser/chromeos/preferences.cc +++ b/chrome/browser/chromeos/preferences.cc @@ -16,7 +16,9 @@ #include "chrome/browser/chromeos/login/login_utils.h" #include "chrome/browser/prefs/pref_member.h" #include "chrome/browser/prefs/pref_service.h" -#include "chrome/common/notification_service.h" +#include "chrome/common/notification_details.h" +#include "chrome/common/notification_source.h" +#include "chrome/common/notification_type.h" #include "chrome/common/pref_names.h" #include "unicode/timezone.h" diff --git a/chrome/browser/chromeos/views/domui_menu_widget.cc b/chrome/browser/chromeos/views/domui_menu_widget.cc index a20aec0..8a5e360 100644 --- a/chrome/browser/chromeos/views/domui_menu_widget.cc +++ b/chrome/browser/chromeos/views/domui_menu_widget.cc @@ -16,7 +16,6 @@ #include "chrome/browser/renderer_host/render_widget_host_view.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/views/dom_view.h" -#include "chrome/common/notification_service.h" #include "chrome/common/url_constants.h" #include "gfx/canvas_skia.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/content_settings/host_content_settings_map_unittest.cc b/chrome/browser/content_settings/host_content_settings_map_unittest.cc index 2e0929e..e7540e2 100644 --- a/chrome/browser/content_settings/host_content_settings_map_unittest.cc +++ b/chrome/browser/content_settings/host_content_settings_map_unittest.cc @@ -12,7 +12,6 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/notification_registrar.h" -#include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "chrome/test/testing_pref_service.h" @@ -795,7 +794,7 @@ TEST_F(HostContentSettingsMapTest, OverwrittenDefaultContentSetting) { EXPECT_EQ(CONTENT_SETTING_BLOCK, host_content_settings_map->GetDefaultContentSetting( CONTENT_SETTINGS_TYPE_COOKIES)); - } +} // If a setting for a default-content-setting-type is set while the type is // managed, then the new setting should be preserved and used after the diff --git a/chrome/browser/cookies_tree_model_unittest.cc b/chrome/browser/cookies_tree_model_unittest.cc index aa5159a..8d03b2a 100644 --- a/chrome/browser/cookies_tree_model_unittest.cc +++ b/chrome/browser/cookies_tree_model_unittest.cc @@ -13,7 +13,6 @@ #include "chrome/browser/mock_browsing_data_local_storage_helper.h" #include "chrome/common/net/url_request_context_getter.h" #include "chrome/common/notification_details.h" -#include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" #include "chrome/test/testing_profile.h" #include "net/url_request/url_request_context.h" diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc index 913e5f2..6f0d998 100644 --- a/chrome/browser/download/download_browsertest.cc +++ b/chrome/browser/download/download_browsertest.cc @@ -17,7 +17,6 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/notification_service.h" #include "chrome/common/url_constants.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" diff --git a/chrome/browser/extensions/extension_browsertests_misc.cc b/chrome/browser/extensions/extension_browsertests_misc.cc index 3af1ea6..df03580 100644 --- a/chrome/browser/extensions/extension_browsertests_misc.cc +++ b/chrome/browser/extensions/extension_browsertests_misc.cc @@ -24,7 +24,6 @@ #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension_action.h" -#include "chrome/common/notification_service.h" #include "chrome/common/url_constants.h" #include "chrome/test/ui_test_utils.h" #include "net/base/mock_host_resolver.h" diff --git a/chrome/browser/extensions/extension_devtools_browsertests.cc b/chrome/browser/extensions/extension_devtools_browsertests.cc index 5742d7b..c29a4ca 100644 --- a/chrome/browser/extensions/extension_devtools_browsertests.cc +++ b/chrome/browser/extensions/extension_devtools_browsertests.cc @@ -21,7 +21,6 @@ #include "chrome/browser/ui/browser.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/devtools_messages.h" -#include "chrome/common/notification_service.h" #include "chrome/common/url_constants.h" #include "chrome/test/ui_test_utils.h" #include "net/base/net_util.h" diff --git a/chrome/browser/extensions/extension_startup_browsertest.cc b/chrome/browser/extensions/extension_startup_browsertest.cc index 224a6c5..25bad91 100644 --- a/chrome/browser/extensions/extension_startup_browsertest.cc +++ b/chrome/browser/extensions/extension_startup_browsertest.cc @@ -18,7 +18,6 @@ #include "chrome/common/notification_details.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" -#include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" diff --git a/chrome/browser/gtk/options/content_settings_window_gtk.cc b/chrome/browser/gtk/options/content_settings_window_gtk.cc index e2d0528..91b0019 100644 --- a/chrome/browser/gtk/options/content_settings_window_gtk.cc +++ b/chrome/browser/gtk/options/content_settings_window_gtk.cc @@ -19,7 +19,6 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/content_settings_types.h" -#include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/history/expire_history_backend_unittest.cc b/chrome/browser/history/expire_history_backend_unittest.cc index 6b10689..161a086 100644 --- a/chrome/browser/history/expire_history_backend_unittest.cc +++ b/chrome/browser/history/expire_history_backend_unittest.cc @@ -23,7 +23,6 @@ #include "chrome/browser/history/text_database_manager.h" #include "chrome/browser/history/thumbnail_database.h" #include "chrome/browser/history/top_sites.h" -#include "chrome/common/notification_service.h" #include "chrome/common/thumbnail_score.h" #include "chrome/test/testing_profile.h" #include "chrome/tools/profiles/thumbnail-inl.h" diff --git a/chrome/browser/history/history_backend_unittest.cc b/chrome/browser/history/history_backend_unittest.cc index ad16e9c..a3b2c86 100644 --- a/chrome/browser/history/history_backend_unittest.cc +++ b/chrome/browser/history/history_backend_unittest.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <set> +#include <vector> + #include "base/file_path.h" #include "base/file_util.h" #include "base/command_line.h" @@ -19,7 +22,8 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/notification_service.h" +#include "chrome/common/notification_details.h" +#include "chrome/common/notification_source.h" #include "chrome/common/thumbnail_score.h" #include "chrome/tools/profiles/thumbnail-inl.h" #include "gfx/codec/jpeg_codec.h" diff --git a/chrome/browser/history/history_unittest.cc b/chrome/browser/history/history_unittest.cc index b570892..e139cdd 100644 --- a/chrome/browser/history/history_unittest.cc +++ b/chrome/browser/history/history_unittest.cc @@ -48,7 +48,8 @@ #include "chrome/browser/history/top_sites.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/notification_service.h" +#include "chrome/common/notification_details.h" +#include "chrome/common/notification_source.h" #include "chrome/common/thumbnail_score.h" #include "chrome/tools/profiles/thumbnail-inl.h" #include "gfx/codec/jpeg_codec.h" diff --git a/chrome/browser/host_zoom_map_unittest.cc b/chrome/browser/host_zoom_map_unittest.cc index f77f96b..d99bfbf 100644 --- a/chrome/browser/host_zoom_map_unittest.cc +++ b/chrome/browser/host_zoom_map_unittest.cc @@ -12,7 +12,7 @@ #include "chrome/common/notification_details.h" #include "chrome/common/notification_observer_mock.h" #include "chrome/common/notification_registrar.h" -#include "chrome/common/notification_service.h" +#include "chrome/common/notification_source.h" #include "chrome/common/notification_type.h" #include "chrome/common/pref_names.h" #include "chrome/test/testing_profile.h" @@ -129,4 +129,3 @@ TEST_F(HostZoomMapTest, ChangeDefaultZoomLevel) { scoped_refptr<HostZoomMap> map(new HostZoomMap(&profile_)); EXPECT_EQ(kDefaultZoomLevel, map->GetZoomLevel(url_)); } - diff --git a/chrome/browser/policy/device_token_fetcher_unittest.cc b/chrome/browser/policy/device_token_fetcher_unittest.cc index e8c2c92..f4a7e23 100644 --- a/chrome/browser/policy/device_token_fetcher_unittest.cc +++ b/chrome/browser/policy/device_token_fetcher_unittest.cc @@ -12,7 +12,6 @@ #include "chrome/browser/policy/device_token_fetcher.h" #include "chrome/browser/policy/mock_device_management_backend.h" #include "chrome/common/net/gaia/gaia_constants.h" -#include "chrome/common/notification_service.h" #include "chrome/test/testing_device_token_fetcher.h" #include "chrome/test/testing_profile.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/prefs/pref_member_unittest.cc b/chrome/browser/prefs/pref_member_unittest.cc index 986fc69..bf9204e 100644 --- a/chrome/browser/prefs/pref_member_unittest.cc +++ b/chrome/browser/prefs/pref_member_unittest.cc @@ -4,7 +4,8 @@ #include "chrome/browser/prefs/pref_member.h" #include "chrome/browser/prefs/pref_value_store.h" -#include "chrome/common/notification_service.h" +#include "chrome/common/notification_details.h" +#include "chrome/common/notification_source.h" #include "chrome/test/testing_pref_service.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/renderer_host/test/render_view_host_manager_browsertest.cc b/chrome/browser/renderer_host/test/render_view_host_manager_browsertest.cc index 949ef58..eaf5719f 100644 --- a/chrome/browser/renderer_host/test/render_view_host_manager_browsertest.cc +++ b/chrome/browser/renderer_host/test/render_view_host_manager_browsertest.cc @@ -16,7 +16,6 @@ #include "chrome/common/notification_details.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" -#include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" diff --git a/chrome/browser/search_engines/keyword_editor_controller_unittest.cc b/chrome/browser/search_engines/keyword_editor_controller_unittest.cc index df49cf0..4952166 100644 --- a/chrome/browser/search_engines/keyword_editor_controller_unittest.cc +++ b/chrome/browser/search_engines/keyword_editor_controller_unittest.cc @@ -11,7 +11,6 @@ #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/search_engines/template_url_table_model.h" #include "chrome/common/notification_details.h" -#include "chrome/common/notification_service.h" #include "chrome/common/notification_source.h" #include "chrome/common/pref_names.h" #include "chrome/test/testing_pref_service.h" diff --git a/chrome/browser/search_engines/template_url_model_unittest.cc b/chrome/browser/search_engines/template_url_model_unittest.cc index f0465ae..532fce6 100644 --- a/chrome/browser/search_engines/template_url_model_unittest.cc +++ b/chrome/browser/search_engines/template_url_model_unittest.cc @@ -19,7 +19,6 @@ #include "chrome/browser/search_engines/template_url_prepopulate_data.h" #include "chrome/browser/webdata/web_database.h" #include "chrome/common/notification_details.h" -#include "chrome/common/notification_service.h" #include "chrome/common/notification_source.h" #include "chrome/common/pref_names.h" #include "chrome/test/testing_pref_service.h" @@ -37,8 +36,8 @@ using base::TimeDelta; #endif // Test the GenerateSearchURL on a thread or the main thread. -class TestGenerateSearchURL : - public base::RefCountedThreadSafe<TestGenerateSearchURL> { +class TestGenerateSearchURL + : public base::RefCountedThreadSafe<TestGenerateSearchURL> { public: explicit TestGenerateSearchURL(SearchTermsData* search_terms_data) : search_terms_data_(search_terms_data), diff --git a/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc b/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc index ed69fda..6ff8af6 100644 --- a/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc +++ b/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc @@ -18,7 +18,6 @@ #include "chrome/browser/sync/profile_sync_service_mock.h" #include "chrome/browser/sync/profile_sync_test_util.h" #include "chrome/browser/webdata/web_data_service.h" -#include "chrome/common/notification_service.h" #include "chrome/common/notification_source.h" #include "chrome/common/notification_type.h" #include "chrome/test/profile_mock.h" diff --git a/chrome/browser/tab_contents/navigation_controller_unittest.cc b/chrome/browser/tab_contents/navigation_controller_unittest.cc index 1a32722..91c23eaa 100644 --- a/chrome/browser/tab_contents/navigation_controller_unittest.cc +++ b/chrome/browser/tab_contents/navigation_controller_unittest.cc @@ -21,7 +21,6 @@ #include "chrome/browser/tab_contents/tab_contents_delegate.h" #include "chrome/browser/tab_contents/test_tab_contents.h" #include "chrome/common/notification_registrar.h" -#include "chrome/common/notification_service.h" #include "chrome/common/render_messages.h" #include "chrome/common/render_messages_params.h" #include "chrome/test/test_notification_tracker.h" diff --git a/chrome/browser/tab_contents/tab_contents_view_mac.mm b/chrome/browser/tab_contents/tab_contents_view_mac.mm index 64dc401..a6b111a 100644 --- a/chrome/browser/tab_contents/tab_contents_view_mac.mm +++ b/chrome/browser/tab_contents/tab_contents_view_mac.mm @@ -24,8 +24,9 @@ #import "chrome/browser/ui/cocoa/web_drag_source.h" #import "chrome/browser/ui/cocoa/web_drop_target.h" #import "chrome/browser/ui/cocoa/view_id_util.h" +#include "chrome/common/notification_details.h" +#include "chrome/common/notification_source.h" #include "chrome/common/notification_type.h" -#include "chrome/common/notification_service.h" #include "chrome/common/render_messages.h" #include "skia/ext/skia_utils_mac.h" #import "third_party/mozilla/NSPasteboard+Utils.h" diff --git a/chrome/browser/tab_contents/test_tab_contents.cc b/chrome/browser/tab_contents/test_tab_contents.cc index ab6a325..0c227a4 100644 --- a/chrome/browser/tab_contents/test_tab_contents.cc +++ b/chrome/browser/tab_contents/test_tab_contents.cc @@ -4,13 +4,16 @@ #include "chrome/browser/tab_contents/test_tab_contents.h" +#include <utility> + #include "chrome/browser/browser_url_handler.h" #include "chrome/browser/renderer_host/mock_render_process_host.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/renderer_host/site_instance.h" #include "chrome/browser/renderer_host/test/test_render_view_host.h" #include "chrome/browser/tab_contents/infobar_delegate.h" -#include "chrome/common/notification_service.h" +#include "chrome/common/notification_details.h" +#include "chrome/common/notification_source.h" TestTabContents::TestTabContents(Profile* profile, SiteInstance* instance) : TabContents(profile, instance, MSG_ROUTING_NONE, NULL, NULL), diff --git a/chrome/browser/tab_contents/web_drag_source_win.cc b/chrome/browser/tab_contents/web_drag_source_win.cc index a51de68..c4e4ebd 100644 --- a/chrome/browser/tab_contents/web_drag_source_win.cc +++ b/chrome/browser/tab_contents/web_drag_source_win.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,8 +9,8 @@ #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/web_drag_utils_win.h" +#include "chrome/common/notification_source.h" #include "chrome/common/notification_type.h" -#include "chrome/common/notification_service.h" using WebKit::WebDragOperationNone; diff --git a/chrome/browser/tabs/tab_strip_model_unittest.cc b/chrome/browser/tabs/tab_strip_model_unittest.cc index 93f7ae8..b33aaa6a 100644 --- a/chrome/browser/tabs/tab_strip_model_unittest.cc +++ b/chrome/browser/tabs/tab_strip_model_unittest.cc @@ -2,13 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <map> +#include <string> + #include "app/system_monitor.h" #include "base/file_path.h" #include "base/file_util.h" #include "base/path_service.h" -#include "base/string_number_conversions.h" #include "base/scoped_ptr.h" -#include "base/string_util.h" #include "base/stl_util-inl.h" #include "base/string_number_conversions.h" #include "base/string_util.h" @@ -27,9 +28,10 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/extensions/extension.h" +#include "chrome/common/notification_details.h" #include "chrome/common/notification_observer_mock.h" #include "chrome/common/notification_registrar.h" -#include "chrome/common/notification_service.h" +#include "chrome/common/notification_source.h" #include "chrome/common/pref_names.h" #include "chrome/common/property_bag.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/translate/translate_manager_unittest.cc b/chrome/browser/translate/translate_manager_unittest.cc index 080c7c1..89cc355 100644 --- a/chrome/browser/translate/translate_manager_unittest.cc +++ b/chrome/browser/translate/translate_manager_unittest.cc @@ -19,7 +19,6 @@ #include "chrome/common/notification_details.h" #include "chrome/common/notification_observer_mock.h" #include "chrome/common/notification_registrar.h" -#include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" #include "chrome/common/pref_names.h" #include "chrome/common/render_messages.h" diff --git a/chrome/browser/ui/cocoa/collected_cookies_mac.mm b/chrome/browser/ui/cocoa/collected_cookies_mac.mm index b54c9d7..23ff4a5 100644 --- a/chrome/browser/ui/cocoa/collected_cookies_mac.mm +++ b/chrome/browser/ui/cocoa/collected_cookies_mac.mm @@ -13,7 +13,8 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" #import "chrome/browser/ui/cocoa/vertical_gradient_view.h" -#include "chrome/common/notification_service.h" +#include "chrome/common/notification_details.h" +#include "chrome/common/notification_source.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "skia/ext/skia_utils_mac.h" diff --git a/chrome/browser/ui/cocoa/download/download_started_animation_mac.mm b/chrome/browser/ui/cocoa/download/download_started_animation_mac.mm index 3bf29d5..d95b732 100644 --- a/chrome/browser/ui/cocoa/download/download_started_animation_mac.mm +++ b/chrome/browser/ui/cocoa/download/download_started_animation_mac.mm @@ -15,8 +15,9 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_view_mac.h" #include "chrome/common/notification_registrar.h" -#include "chrome/common/notification_service.h" #import "chrome/browser/ui/cocoa/animatable_image.h" +#include "chrome/common/notification_details.h" +#include "chrome/common/notification_source.h" #include "grit/theme_resources.h" #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" #include "third_party/skia/include/utils/mac/SkCGUtils.h" diff --git a/chrome/browser/ui/cocoa/extension_installed_bubble_controller.mm b/chrome/browser/ui/cocoa/extension_installed_bubble_controller.mm index a178ca0..f417ff7 100644 --- a/chrome/browser/ui/cocoa/extension_installed_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/extension_installed_bubble_controller.mm @@ -20,8 +20,9 @@ #include "chrome/browser/ui/browser_window.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_action.h" +#include "chrome/common/notification_details.h" #include "chrome/common/notification_registrar.h" -#include "chrome/common/notification_service.h" +#include "chrome/common/notification_source.h" #include "grit/generated_resources.h" #import "skia/ext/skia_utils_mac.h" #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" diff --git a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm index 2920734..97e51f5 100644 --- a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm @@ -23,9 +23,10 @@ #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h" #import "chrome/browser/ui/cocoa/menu_button.h" #include "chrome/common/extensions/extension_action.h" +#include "chrome/common/notification_details.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" -#include "chrome/common/notification_service.h" +#include "chrome/common/notification_source.h" #include "chrome/common/pref_names.h" #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" diff --git a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm index 36192c2..7404c3d 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm @@ -14,8 +14,9 @@ #import "chrome/browser/ui/cocoa/browser_window_cocoa.h" #import "chrome/browser/ui/cocoa/extension_view_mac.h" #import "chrome/browser/ui/cocoa/info_bubble_window.h" +#include "chrome/common/notification_details.h" #include "chrome/common/notification_registrar.h" -#include "chrome/common/notification_service.h" +#include "chrome/common/notification_source.h" namespace { // The duration for any animations that might be invoked by this controller. diff --git a/chrome/browser/ui/cocoa/infobar_container_controller.mm b/chrome/browser/ui/cocoa/infobar_container_controller.mm index b9d32cc..adca3e7 100644 --- a/chrome/browser/ui/cocoa/infobar_container_controller.mm +++ b/chrome/browser/ui/cocoa/infobar_container_controller.mm @@ -11,7 +11,8 @@ #import "chrome/browser/ui/cocoa/infobar_container_controller.h" #import "chrome/browser/ui/cocoa/infobar_controller.h" #import "chrome/browser/ui/cocoa/view_id_util.h" -#include "chrome/common/notification_service.h" +#include "chrome/common/notification_details.h" +#include "chrome/common/notification_source.h" #include "skia/ext/skia_utils_mac.h" // C++ class that receives INFOBAR_ADDED and INFOBAR_REMOVED diff --git a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc index ff392e4..4923ea7 100644 --- a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc +++ b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc @@ -17,7 +17,6 @@ #include "chrome/browser/ui/find_bar/find_bar.h" #include "chrome/browser/ui/find_bar/find_bar_controller.h" #include "chrome/browser/ui/find_bar/find_notification_details.h" -#include "chrome/common/notification_service.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" #include "net/test/test_server.h" diff --git a/chrome/browser/ui/login/login_prompt_mac.mm b/chrome/browser/ui/login/login_prompt_mac.mm index d2f28d2..2ee0252 100644 --- a/chrome/browser/ui/login/login_prompt_mac.mm +++ b/chrome/browser/ui/login/login_prompt_mac.mm @@ -18,7 +18,6 @@ #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/browser/ui/cocoa/constrained_window_mac.h" #include "chrome/browser/ui/login/login_model.h" -#include "chrome/common/notification_service.h" #include "grit/generated_resources.h" #include "net/url_request/url_request.h" #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" diff --git a/chrome/browser/ui/login/login_prompt_win.cc b/chrome/browser/ui/login/login_prompt_win.cc index d73954b..a167885 100644 --- a/chrome/browser/ui/login/login_prompt_win.cc +++ b/chrome/browser/ui/login/login_prompt_win.cc @@ -15,7 +15,6 @@ #include "chrome/browser/tab_contents/tab_contents_delegate.h" #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/browser/ui/views/login_view.h" -#include "chrome/common/notification_service.h" #include "grit/generated_resources.h" #include "net/url_request/url_request.h" #include "views/window/dialog_delegate.h" diff --git a/chrome/browser/ui/views/collected_cookies_win.cc b/chrome/browser/ui/views/collected_cookies_win.cc index 93556fb..308c0c4 100644 --- a/chrome/browser/ui/views/collected_cookies_win.cc +++ b/chrome/browser/ui/views/collected_cookies_win.cc @@ -9,7 +9,8 @@ #include "chrome/browser/cookies_tree_model.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/common/notification_service.h" +#include "chrome/common/notification_details.h" +#include "chrome/common/notification_source.h" #include "gfx/color_utils.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" @@ -33,7 +34,7 @@ void ShowCollectedCookiesDialog(gfx::NativeWindow parent_window, new CollectedCookiesWin(parent_window, tab_contents); } -} // namespace browser +} // namespace browser namespace { // Spacing between the infobar frame and its contents. @@ -47,7 +48,7 @@ const int kInfobarBorderSize = 1; const int kTreeViewWidth = 400; const int kTreeViewHeight = 125; -} // namespace +} // namespace // A custom view that conditionally displays an infobar. class InfobarView : public views::View { diff --git a/chrome/browser/ui/views/download_started_animation_win.cc b/chrome/browser/ui/views/download_started_animation_win.cc index e142b14..23989939 100644 --- a/chrome/browser/ui/views/download_started_animation_win.cc +++ b/chrome/browser/ui/views/download_started_animation_win.cc @@ -7,8 +7,9 @@ #include "app/linear_animation.h" #include "app/resource_bundle.h" #include "chrome/browser/tab_contents/tab_contents.h" +#include "chrome/common/notification_details.h" #include "chrome/common/notification_registrar.h" -#include "chrome/common/notification_service.h" +#include "chrome/common/notification_source.h" #include "gfx/rect.h" #include "grit/theme_resources.h" #include "views/controls/image_view.h" diff --git a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc index fd5cf0b..bbac784 100644 --- a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc +++ b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc @@ -18,7 +18,8 @@ #include "chrome/browser/views/toolbar_view.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_action.h" -#include "chrome/common/notification_service.h" +#include "chrome/common/notification_details.h" +#include "chrome/common/notification_source.h" #include "chrome/common/notification_type.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/views/infobars/infobar_container.cc b/chrome/browser/ui/views/infobars/infobar_container.cc index 5096629..527aacc 100644 --- a/chrome/browser/ui/views/infobars/infobar_container.cc +++ b/chrome/browser/ui/views/infobars/infobar_container.cc @@ -9,7 +9,8 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/view_ids.h" #include "chrome/browser/ui/views/infobars/infobars.h" -#include "chrome/common/notification_service.h" +#include "chrome/common/notification_details.h" +#include "chrome/common/notification_source.h" #include "grit/generated_resources.h" // InfoBarContainer, public: --------------------------------------------------- diff --git a/chrome/browser/ui/views/options/options_page_view.cc b/chrome/browser/ui/views/options/options_page_view.cc index 0ec87f1..81b1e98 100644 --- a/chrome/browser/ui/views/options/options_page_view.cc +++ b/chrome/browser/ui/views/options/options_page_view.cc @@ -6,7 +6,6 @@ #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/prefs/pref_service.h" -#include "chrome/common/notification_service.h" #include "views/widget/widget.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/chrome/browser/ui/views/repost_form_warning_view.cc b/chrome/browser/ui/views/repost_form_warning_view.cc index 7d7ed67..d29258b 100644 --- a/chrome/browser/ui/views/repost_form_warning_view.cc +++ b/chrome/browser/ui/views/repost_form_warning_view.cc @@ -11,7 +11,6 @@ #include "chrome/browser/repost_form_warning_controller.h" #include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/common/notification_service.h" #include "grit/generated_resources.h" #include "views/controls/message_box_view.h" #include "views/window/window.h" diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_container.cc b/chrome/browser/ui/views/tab_contents/tab_contents_container.cc index eb5b1ad..793e53c 100644 --- a/chrome/browser/ui/views/tab_contents/tab_contents_container.cc +++ b/chrome/browser/ui/views/tab_contents/tab_contents_container.cc @@ -10,7 +10,8 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/view_ids.h" #include "chrome/browser/ui/views/tab_contents/native_tab_contents_container.h" -#include "chrome/common/notification_service.h" +#include "chrome/common/notification_details.h" +#include "chrome/common/notification_source.h" #if defined(TOUCH_UI) #include "chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.h" @@ -152,7 +153,7 @@ void TabContentsContainer::RemoveObservers() { void TabContentsContainer::RenderViewHostChanged(RenderViewHost* old_host, RenderViewHost* new_host) { #if defined(TOUCH_UI) - NOTIMPLEMENTED(); // TODO(anicolao) + NOTIMPLEMENTED(); // TODO(anicolao) #else if (new_host) { RenderWidgetHostViewChanged( diff --git a/chrome/browser/ui/views/tabs/dragged_tab_controller.cc b/chrome/browser/ui/views/tabs/dragged_tab_controller.cc index 691f99fa..d7e350a 100644 --- a/chrome/browser/ui/views/tabs/dragged_tab_controller.cc +++ b/chrome/browser/ui/views/tabs/dragged_tab_controller.cc @@ -28,7 +28,8 @@ #include "chrome/browser/views/tabs/side_tab_strip.h" #include "chrome/browser/views/tabs/tab.h" #include "chrome/browser/views/tabs/tab_strip.h" -#include "chrome/common/notification_service.h" +#include "chrome/common/notification_details.h" +#include "chrome/common/notification_source.h" #include "gfx/canvas_skia.h" #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkBitmap.h" @@ -42,8 +43,8 @@ #endif #if defined(OS_LINUX) -#include <gdk/gdk.h> -#include <gdk/gdkkeysyms.h> +#include <gdk/gdk.h> // NOLINT +#include <gdk/gdkkeysyms.h> // NOLINT #endif static const int kHorizontalMoveThreshold = 16; // Pixels. |