diff options
Diffstat (limited to 'chrome/browser')
32 files changed, 40 insertions, 21 deletions
diff --git a/chrome/browser/chromeos/notifications/balloon_view.h b/chrome/browser/chromeos/notifications/balloon_view.h index e275915..8f00ccd 100644 --- a/chrome/browser/chromeos/notifications/balloon_view.h +++ b/chrome/browser/chromeos/notifications/balloon_view.h @@ -14,7 +14,6 @@ #include "chrome/browser/notifications/balloon.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" -#include "chrome/common/notification_service.h" #include "gfx/path.h" #include "gfx/point.h" #include "gfx/rect.h" diff --git a/chrome/browser/chromeos/notifications/notification_panel.cc b/chrome/browser/chromeos/notifications/notification_panel.cc index 6ab3b31..efd8c1a 100644 --- a/chrome/browser/chromeos/notifications/notification_panel.cc +++ b/chrome/browser/chromeos/notifications/notification_panel.cc @@ -6,10 +6,14 @@ #include "chrome/browser/chromeos/notifications/notification_panel.h" +#include <algorithm> + #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "chrome/browser/chromeos/notifications/balloon_collection_impl.h" #include "chrome/browser/chromeos/notifications/balloon_view.h" +#include "chrome/common/notification_details.h" +#include "chrome/common/notification_source.h" #include "cros/chromeos_wm_ipc_enums.h" #include "gfx/canvas.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/chromeos/offline/offline_load_page.cc b/chrome/browser/chromeos/offline/offline_load_page.cc index 420ddea..e466d75f 100644 --- a/chrome/browser/chromeos/offline/offline_load_page.cc +++ b/chrome/browser/chromeos/offline/offline_load_page.cc @@ -23,6 +23,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/jstemplate_builder.h" +#include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" #include "chrome/common/url_constants.h" #include "grit/browser_resources.h" diff --git a/chrome/browser/chromeos/offline/offline_load_page.h b/chrome/browser/chromeos/offline/offline_load_page.h index 2708167..e4a6246 100644 --- a/chrome/browser/chromeos/offline/offline_load_page.h +++ b/chrome/browser/chromeos/offline/offline_load_page.h @@ -12,7 +12,6 @@ #include "chrome/browser/chromeos/network_state_notifier.h" #include "chrome/browser/tab_contents/interstitial_page.h" #include "chrome/common/notification_observer.h" -#include "chrome/common/notification_service.h" class DictionaryValue; class Extension; diff --git a/chrome/browser/chromeos/options/language_config_model.h b/chrome/browser/chromeos/options/language_config_model.h index 67ec867..d8662be 100644 --- a/chrome/browser/chromeos/options/language_config_model.h +++ b/chrome/browser/chromeos/options/language_config_model.h @@ -14,7 +14,6 @@ #include "chrome/browser/language_combobox_model.h" #include "chrome/browser/prefs/pref_member.h" #include "chrome/browser/prefs/pref_service.h" -#include "chrome/common/notification_service.h" #include "cros/chromeos_input_method.h" class Profile; diff --git a/chrome/browser/chromeos/status/clock_menu_button.h b/chrome/browser/chromeos/status/clock_menu_button.h index ee1d979..c1bea3c 100644 --- a/chrome/browser/chromeos/status/clock_menu_button.h +++ b/chrome/browser/chromeos/status/clock_menu_button.h @@ -11,7 +11,6 @@ #include "chrome/browser/chromeos/cros/system_library.h" #include "chrome/browser/chromeos/status/status_area_button.h" #include "chrome/common/notification_observer.h" -#include "chrome/common/notification_service.h" #include "unicode/calendar.h" #include "views/controls/button/menu_button.h" #include "views/controls/menu/menu_2.h" diff --git a/chrome/browser/chromeos/status/input_method_menu.cc b/chrome/browser/chromeos/status/input_method_menu.cc index 1b659a0..ba782b9 100644 --- a/chrome/browser/chromeos/status/input_method_menu.cc +++ b/chrome/browser/chromeos/status/input_method_menu.cc @@ -20,6 +20,7 @@ #include "chrome/browser/chromeos/language_preferences.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/prefs/pref_service.h" +#include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/chromeos/status/input_method_menu.h b/chrome/browser/chromeos/status/input_method_menu.h index 78562d1..814526e 100644 --- a/chrome/browser/chromeos/status/input_method_menu.h +++ b/chrome/browser/chromeos/status/input_method_menu.h @@ -6,12 +6,13 @@ #define CHROME_BROWSER_CHROMEOS_STATUS_INPUT_METHOD_MENU_H_ #pragma once +#include <string> + #include "app/menus/simple_menu_model.h" #include "chrome/browser/chromeos/cros/input_method_library.h" #include "chrome/browser/prefs/pref_member.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 "views/controls/menu/menu_2.h" #include "views/controls/menu/view_menu_delegate.h" diff --git a/chrome/browser/debugger/devtools_manager.cc b/chrome/browser/debugger/devtools_manager.cc index 053b49a..e8e69e1 100644 --- a/chrome/browser/debugger/devtools_manager.cc +++ b/chrome/browser/debugger/devtools_manager.cc @@ -19,6 +19,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/renderer_host/site_instance.h" +#include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/debugger/devtools_window.cc b/chrome/browser/debugger/devtools_window.cc index 697f00a..08231e3 100644 --- a/chrome/browser/debugger/devtools_window.cc +++ b/chrome/browser/debugger/devtools_window.cc @@ -28,6 +28,7 @@ #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/bindings_policy.h" #include "chrome/common/chrome_switches.h" +#include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/debugger/devtools_window.h b/chrome/browser/debugger/devtools_window.h index 71c8871..e7b9afc 100644 --- a/chrome/browser/debugger/devtools_window.h +++ b/chrome/browser/debugger/devtools_window.h @@ -14,7 +14,6 @@ #include "chrome/browser/tab_contents/tab_contents_delegate.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" -#include "chrome/common/notification_service.h" namespace IPC { class Message; @@ -49,7 +48,7 @@ class DevToolsWindow RenderViewHost* GetRenderViewHost(); TabContentsWrapper* tab_contents() { return tab_contents_; } - Browser* browser() { return browser_; } // For tests. + Browser* browser() { return browser_; } // For tests. bool is_docked() { return docked_; } private: diff --git a/chrome/browser/extensions/extension_apitest.h b/chrome/browser/extensions/extension_apitest.h index b2079a6..4f76d28 100644 --- a/chrome/browser/extensions/extension_apitest.h +++ b/chrome/browser/extensions/extension_apitest.h @@ -11,7 +11,6 @@ #include "base/values.h" #include "chrome/browser/extensions/extension_browsertest.h" -#include "chrome/common/notification_service.h" class Extension; diff --git a/chrome/browser/extensions/extension_function_dispatcher.cc b/chrome/browser/extensions/extension_function_dispatcher.cc index b037b1c..cd6714e 100644 --- a/chrome/browser/extensions/extension_function_dispatcher.cc +++ b/chrome/browser/extensions/extension_function_dispatcher.cc @@ -54,6 +54,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/browser/renderer_host/render_view_host.h" +#include "chrome/common/notification_service.h" #include "chrome/common/render_messages.h" #include "chrome/common/render_messages_params.h" #include "chrome/common/result_codes.h" diff --git a/chrome/browser/extensions/extension_menu_manager.cc b/chrome/browser/extensions/extension_menu_manager.cc index 1a8041e..5e2cabd 100644 --- a/chrome/browser/extensions/extension_menu_manager.cc +++ b/chrome/browser/extensions/extension_menu_manager.cc @@ -17,6 +17,7 @@ #include "chrome/browser/extensions/extension_tabs_module.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/extension.h" +#include "chrome/common/notification_service.h" #include "gfx/favicon_size.h" #include "webkit/glue/context_menu.h" diff --git a/chrome/browser/extensions/extension_messages_apitest.cc b/chrome/browser/extensions/extension_messages_apitest.cc index 8a30bdd..24291a5 100644 --- a/chrome/browser/extensions/extension_messages_apitest.cc +++ b/chrome/browser/extensions/extension_messages_apitest.cc @@ -6,6 +6,7 @@ #include "chrome/browser/extensions/extension_event_router.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/notification_registrar.h" +#include "chrome/common/notification_service.h" #include "googleurl/src/gurl.h" namespace { diff --git a/chrome/browser/extensions/extension_metrics_apitest.cc b/chrome/browser/extensions/extension_metrics_apitest.cc index 271940f..81875b6 100644 --- a/chrome/browser/extensions/extension_metrics_apitest.cc +++ b/chrome/browser/extensions/extension_metrics_apitest.cc @@ -9,6 +9,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/notification_registrar.h" +#include "chrome/common/notification_service.h" namespace { diff --git a/chrome/browser/extensions/extension_tabs_module.cc b/chrome/browser/extensions/extension_tabs_module.cc index 129db62..1812b4c 100644 --- a/chrome/browser/extensions/extension_tabs_module.cc +++ b/chrome/browser/extensions/extension_tabs_module.cc @@ -4,6 +4,9 @@ #include "chrome/browser/extensions/extension_tabs_module.h" +#include <algorithm> +#include <vector> + #include "base/base64.h" #include "base/string_number_conversions.h" #include "base/string_util.h" @@ -30,6 +33,7 @@ #include "chrome/browser/ui/window_sizer.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_error_utils.h" +#include "chrome/common/notification_service.h" #include "chrome/common/url_constants.h" #include "gfx/codec/jpeg_codec.h" #include "gfx/codec/png_codec.h" diff --git a/chrome/browser/extensions/extension_tabs_module.h b/chrome/browser/extensions/extension_tabs_module.h index 4307c90..7125867 100644 --- a/chrome/browser/extensions/extension_tabs_module.h +++ b/chrome/browser/extensions/extension_tabs_module.h @@ -9,7 +9,6 @@ #include <string> #include "chrome/browser/extensions/extension_function.h" -#include "chrome/common/notification_service.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" diff --git a/chrome/browser/history/top_sites.h b/chrome/browser/history/top_sites.h index 0cba15b..9eeb715 100644 --- a/chrome/browser/history/top_sites.h +++ b/chrome/browser/history/top_sites.h @@ -22,7 +22,6 @@ #include "chrome/browser/history/history_types.h" #include "chrome/browser/history/history.h" #include "chrome/browser/history/page_usage_data.h" -#include "chrome/common/notification_service.h" #include "chrome/common/thumbnail_score.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/net/gaia/token_service_unittest.h b/chrome/browser/net/gaia/token_service_unittest.h index 674baf0..46cffb0c 100644 --- a/chrome/browser/net/gaia/token_service_unittest.h +++ b/chrome/browser/net/gaia/token_service_unittest.h @@ -12,6 +12,8 @@ #include "chrome/browser/password_manager/encryptor.h" #include "chrome/browser/webdata/web_data_service.h" #include "chrome/common/net/gaia/gaia_auth_consumer.h" +#include "chrome/common/notification_details.h" +#include "chrome/common/notification_source.h" #include "chrome/test/signaling_task.h" #include "chrome/test/test_notification_tracker.h" #include "chrome/test/testing_profile.h" diff --git a/chrome/browser/password_manager/password_store_mac.cc b/chrome/browser/password_manager/password_store_mac.cc index 0a0a88b..f45200a 100644 --- a/chrome/browser/password_manager/password_store_mac.cc +++ b/chrome/browser/password_manager/password_store_mac.cc @@ -20,6 +20,7 @@ #include "chrome/browser/keychain_mac.h" #include "chrome/browser/password_manager/login_database.h" #include "chrome/browser/password_manager/password_store_change.h" +#include "chrome/common/notification_service.h" using webkit_glue::PasswordForm; diff --git a/chrome/browser/password_manager/password_store_mac.h b/chrome/browser/password_manager/password_store_mac.h index aa5b144..8a70338 100644 --- a/chrome/browser/password_manager/password_store_mac.h +++ b/chrome/browser/password_manager/password_store_mac.h @@ -12,9 +12,9 @@ #include "base/thread.h" #include "chrome/browser/password_manager/login_database.h" #include "chrome/browser/password_manager/password_store.h" -#include "chrome/common/notification_service.h" class MacKeychain; +class NotificationService; // Implements PasswordStore on top of the OS X Keychain, with an internal // database for extra metadata. For an overview of the interactions with the diff --git a/chrome/browser/sync/test_profile_sync_service.h b/chrome/browser/sync/test_profile_sync_service.h index f2b04aa..f5da3d6 100644 --- a/chrome/browser/sync/test_profile_sync_service.h +++ b/chrome/browser/sync/test_profile_sync_service.h @@ -18,7 +18,6 @@ #include "chrome/browser/sync/sessions/session_state.h" #include "chrome/browser/sync/syncable/directory_manager.h" #include "chrome/browser/sync/syncable/syncable.h" -#include "chrome/common/notification_service.h" #include "chrome/test/profile_mock.h" #include "chrome/test/sync/test_http_bridge_factory.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/tab_contents/render_view_host_manager_unittest.cc b/chrome/browser/tab_contents/render_view_host_manager_unittest.cc index ece7e64..d6a58a1 100644 --- a/chrome/browser/tab_contents/render_view_host_manager_unittest.cc +++ b/chrome/browser/tab_contents/render_view_host_manager_unittest.cc @@ -10,6 +10,8 @@ #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/tab_contents/render_view_host_manager.h" #include "chrome/browser/tab_contents/test_tab_contents.h" +#include "chrome/common/notification_details.h" +#include "chrome/common/notification_source.h" #include "chrome/common/render_messages.h" #include "chrome/common/render_messages_params.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm index 03a9f0f..2920734 100644 --- a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm @@ -25,6 +25,7 @@ #include "chrome/common/extensions/extension_action.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" +#include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" diff --git a/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm b/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm index 019492d..5ab186b 100644 --- a/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm +++ b/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm @@ -16,6 +16,7 @@ #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" #include "chrome/common/extensions/extension_action.h" #include "chrome/common/extensions/extension_resource.h" +#include "chrome/common/notification_service.h" #include "skia/ext/skia_utils_mac.h" namespace { diff --git a/chrome/browser/ui/cocoa/theme_install_bubble_view.h b/chrome/browser/ui/cocoa/theme_install_bubble_view.h index f8208df..f2a8a4a 100644 --- a/chrome/browser/ui/cocoa/theme_install_bubble_view.h +++ b/chrome/browser/ui/cocoa/theme_install_bubble_view.h @@ -2,9 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#ifndef CHROME_BROWSER_UI_COCOA_THEME_INSTALL_BUBBLE_VIEW_H_ +#define CHROME_BROWSER_UI_COCOA_THEME_INSTALL_BUBBLE_VIEW_H_ +#pragma once + #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" -#include "chrome/common/notification_service.h" @class NSWindow; @class ThemeInstallBubbleViewCocoa; @@ -55,3 +58,5 @@ class ThemeInstallBubbleView : public NotificationObserver { DISALLOW_COPY_AND_ASSIGN(ThemeInstallBubbleView); }; + +#endif // CHROME_BROWSER_UI_COCOA_THEME_INSTALL_BUBBLE_VIEW_H_ diff --git a/chrome/browser/ui/cocoa/theme_install_bubble_view.mm b/chrome/browser/ui/cocoa/theme_install_bubble_view.mm index 31c5e81..9841230 100644 --- a/chrome/browser/ui/cocoa/theme_install_bubble_view.mm +++ b/chrome/browser/ui/cocoa/theme_install_bubble_view.mm @@ -8,6 +8,7 @@ #include "app/l10n_util_mac.h" #include "base/scoped_nsobject.h" +#include "chrome/common/notification_service.h" #include "grit/generated_resources.h" namespace { diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc index b033a15..a0b01cc 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc @@ -36,6 +36,7 @@ #include "chrome/browser/ui/views/location_bar/page_action_with_badge_view.h" #include "chrome/browser/ui/views/location_bar/selected_keyword_view.h" #include "chrome/browser/ui/views/location_bar/star_view.h" +#include "chrome/common/notification_service.h" #include "gfx/canvas_skia.h" #include "gfx/color_utils.h" #include "gfx/skia_util.h" @@ -785,7 +786,7 @@ bool LocationBarView::OnCommitSuggestedText(const std::wstring& typed_text) { return false; #if defined(OS_WIN) - if(!HasValidSuggestText()) + if (!HasValidSuggestText()) return false; location_entry_->model()->FinalizeInstantQuery( typed_text, @@ -938,8 +939,8 @@ void LocationBarView::LayoutView(views::View* view, void LocationBarView::RefreshContentSettingViews() { for (ContentSettingViews::const_iterator i(content_setting_views_.begin()); i != content_setting_views_.end(); ++i) { - (*i)->UpdateFromTabContents( - model_->input_in_progress() ? NULL : GetTabContentsFromDelegate(delegate_)); + (*i)->UpdateFromTabContents(model_->input_in_progress() ? NULL : + GetTabContentsFromDelegate(delegate_)); } } diff --git a/chrome/browser/ui/views/notifications/balloon_view.h b/chrome/browser/ui/views/notifications/balloon_view.h index c4e7efd..9bcea0e 100644 --- a/chrome/browser/ui/views/notifications/balloon_view.h +++ b/chrome/browser/ui/views/notifications/balloon_view.h @@ -15,7 +15,6 @@ #include "chrome/browser/notifications/balloon.h" #include "chrome/browser/views/notifications/balloon_view_host.h" #include "chrome/common/notification_registrar.h" -#include "chrome/common/notification_service.h" #include "gfx/path.h" #include "gfx/point.h" #include "gfx/rect.h" diff --git a/chrome/browser/ui/views/theme_install_bubble_view.cc b/chrome/browser/ui/views/theme_install_bubble_view.cc index 7593fc7..d811774 100644 --- a/chrome/browser/ui/views/theme_install_bubble_view.cc +++ b/chrome/browser/ui/views/theme_install_bubble_view.cc @@ -7,6 +7,7 @@ #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "chrome/browser/tab_contents/tab_contents.h" +#include "chrome/common/notification_service.h" #include "gfx/canvas_skia.h" #include "grit/generated_resources.h" #include "views/widget/widget.h" @@ -24,7 +25,7 @@ static const int kTextVertPadding = 45; // track of number of loads happening. Close bubble when num_loads < 1. static int num_loads_extant_ = 0; -} +} // namespace ThemeInstallBubbleView::ThemeInstallBubbleView(TabContents* tab_contents) : popup_(NULL) { @@ -162,4 +163,3 @@ void ThemeInstallBubbleView::Show(TabContents* tab_contents) { if (num_loads_extant_ < 2) new ThemeInstallBubbleView(tab_contents); } - diff --git a/chrome/browser/ui/views/theme_install_bubble_view.h b/chrome/browser/ui/views/theme_install_bubble_view.h index f0460b9..ca4c827 100644 --- a/chrome/browser/ui/views/theme_install_bubble_view.h +++ b/chrome/browser/ui/views/theme_install_bubble_view.h @@ -10,7 +10,6 @@ #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" -#include "chrome/common/notification_service.h" #include "gfx/canvas.h" #include "views/controls/label.h" @@ -76,4 +75,3 @@ class ThemeInstallBubbleView : public NotificationObserver, }; #endif // CHROME_BROWSER_UI_VIEWS_THEME_INSTALL_BUBBLE_VIEW_H_ - |