diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-09 01:21:31 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-09 01:21:31 +0000 |
| commit | b3841c50db1323405954b8fc9f7db6095e886546 (patch) | |
| tree | 72a139a1aebf89d2d2bd852f059fe3c58170382c | |
| parent | 9d51333be541c5876819005c3422b649585f191a (diff) | |
| download | chromium_src-b3841c50db1323405954b8fc9f7db6095e886546.zip chromium_src-b3841c50db1323405954b8fc9f7db6095e886546.tar.gz chromium_src-b3841c50db1323405954b8fc9f7db6095e886546.tar.bz2 | |
Update a bunch of files to the new location of notification files.
Second part of the remaining files.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/6639008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77396 0039d316-1c4b-4281-b951-d872f2087c98
122 files changed, 301 insertions, 301 deletions
diff --git a/chrome/browser/extensions/extension_omnibox_api.cc b/chrome/browser/extensions/extension_omnibox_api.cc index 408fa1f..228aaa6 100644 --- a/chrome/browser/extensions/extension_omnibox_api.cc +++ b/chrome/browser/extensions/extension_omnibox_api.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -13,7 +13,7 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url.h" -#include "chrome/common/notification_service.h" +#include "content/common/notification_service.h" namespace events { const char kOnInputStarted[] = "omnibox.onInputStarted"; diff --git a/chrome/browser/extensions/extension_omnibox_apitest.cc b/chrome/browser/extensions/extension_omnibox_apitest.cc index 4592b0b..ca9ce2c 100644 --- a/chrome/browser/extensions/extension_omnibox_apitest.cc +++ b/chrome/browser/extensions/extension_omnibox_apitest.cc @@ -18,9 +18,9 @@ #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/omnibox/location_bar.h" -#include "chrome/common/notification_type.h" #include "chrome/common/url_constants.h" #include "chrome/test/ui_test_utils.h" +#include "content/common/notification_type.h" // Basic test is flaky on ChromeOS. // http://crbug.com/52929 diff --git a/chrome/browser/extensions/extension_prefs.cc b/chrome/browser/extensions/extension_prefs.cc index bf5a776..4041b9b 100644 --- a/chrome/browser/extensions/extension_prefs.cc +++ b/chrome/browser/extensions/extension_prefs.cc @@ -4,16 +4,16 @@ #include "chrome/browser/extensions/extension_prefs.h" -#include "base/string_util.h" #include "base/string_number_conversions.h" +#include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/extensions/extension_pref_store.h" #include "chrome/browser/prefs/pref_notifier.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/url_pattern.h" -#include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" +#include "content/common/notification_service.h" using base::Time; diff --git a/chrome/browser/extensions/extension_process_manager.cc b/chrome/browser/extensions/extension_process_manager.cc index 8cf8ae1..14ce191 100644 --- a/chrome/browser/extensions/extension_process_manager.cc +++ b/chrome/browser/extensions/extension_process_manager.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -15,13 +15,13 @@ #include "chrome/browser/ui/browser.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_action.h" -#include "chrome/common/notification_service.h" -#include "chrome/common/notification_type.h" #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/site_instance.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/common/notification_service.h" +#include "content/common/notification_type.h" namespace { diff --git a/chrome/browser/extensions/extension_process_manager.h b/chrome/browser/extensions/extension_process_manager.h index 2d812ef..f7b4c21 100644 --- a/chrome/browser/extensions/extension_process_manager.h +++ b/chrome/browser/extensions/extension_process_manager.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -11,9 +11,9 @@ #include <string> #include "base/ref_counted.h" -#include "chrome/common/notification_observer.h" -#include "chrome/common/notification_registrar.h" #include "chrome/common/view_types.h" +#include "content/common/notification_observer.h" +#include "content/common/notification_registrar.h" class Browser; class BrowsingInstance; diff --git a/chrome/browser/extensions/extension_processes_api.cc b/chrome/browser/extensions/extension_processes_api.cc index 3e92877..3944b47 100644 --- a/chrome/browser/extensions/extension_processes_api.cc +++ b/chrome/browser/extensions/extension_processes_api.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -20,9 +20,9 @@ #include "chrome/browser/task_manager/task_manager.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/extensions/extension_error_utils.h" -#include "chrome/common/notification_type.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/common/notification_type.h" namespace keys = extension_processes_api_constants; diff --git a/chrome/browser/extensions/extension_processes_api.h b/chrome/browser/extensions/extension_processes_api.h index 590d27a..fe0a2f9 100644 --- a/chrome/browser/extensions/extension_processes_api.h +++ b/chrome/browser/extensions/extension_processes_api.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -11,7 +11,7 @@ #include "chrome/browser/extensions/extension_function.h" #include "chrome/browser/task_manager/task_manager.h" -#include "chrome/common/notification_registrar.h" +#include "content/common/notification_registrar.h" // Observes the Task Manager and routes the notifications as events to the // extension system. diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc index 7d6d5e10..dcf15d8 100644 --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc @@ -57,11 +57,11 @@ #include "chrome/common/extensions/extension_l10n_util.h" #include "chrome/common/extensions/extension_resource.h" #include "chrome/common/json_value_serializer.h" -#include "chrome/common/notification_service.h" -#include "chrome/common/notification_type.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "content/browser/browser_thread.h" +#include "content/common/notification_service.h" +#include "content/common/notification_type.h" #include "googleurl/src/gurl.h" #include "net/base/registry_controlled_domain.h" #include "webkit/database/database_tracker.h" diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h index 97d5f6c..515b3f4 100644 --- a/chrome/browser/extensions/extension_service.h +++ b/chrome/browser/extensions/extension_service.h @@ -30,11 +30,11 @@ #include "chrome/browser/extensions/pending_extension_info.h" #include "chrome/browser/extensions/sandboxed_extension_unpacker.h" #include "chrome/browser/prefs/pref_change_registrar.h" -#include "chrome/common/notification_observer.h" -#include "chrome/common/notification_registrar.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/property_bag.h" #include "content/browser/browser_thread.h" +#include "content/common/notification_observer.h" +#include "content/common/notification_registrar.h" class ExtensionBrowserEventRouter; class ExtensionServiceBackend; diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc index c623f33..6e7ef31 100644 --- a/chrome/browser/extensions/extension_service_unittest.cc +++ b/chrome/browser/extensions/extension_service_unittest.cc @@ -27,8 +27,8 @@ #include "chrome/browser/extensions/extension_error_reporter.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_special_storage_policy.h" -#include "chrome/browser/extensions/external_extension_provider_interface.h" #include "chrome/browser/extensions/external_extension_provider_impl.h" +#include "chrome/browser/extensions/external_extension_provider_interface.h" #include "chrome/browser/extensions/external_pref_extension_loader.h" #include "chrome/browser/extensions/pack_extension_job.cc" #include "chrome/browser/prefs/browser_prefs.h" @@ -42,9 +42,6 @@ #include "chrome/common/extensions/url_pattern.h" #include "chrome/common/json_value_serializer.h" #include "chrome/common/net/url_request_context_getter.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/url_constants.h" #include "chrome/test/testing_profile.h" @@ -53,6 +50,9 @@ #include "content/browser/file_system/browser_file_system_helper.h" #include "content/browser/in_process_webkit/dom_storage_context.h" #include "content/browser/in_process_webkit/webkit_context.h" +#include "content/common/notification_registrar.h" +#include "content/common/notification_service.h" +#include "content/common/notification_type.h" #include "googleurl/src/gurl.h" #include "net/base/cookie_monster.h" #include "net/base/cookie_options.h" diff --git a/chrome/browser/extensions/extension_startup_browsertest.cc b/chrome/browser/extensions/extension_startup_browsertest.cc index 14aa81f..129e184 100644 --- a/chrome/browser/extensions/extension_startup_browsertest.cc +++ b/chrome/browser/extensions/extension_startup_browsertest.cc @@ -14,11 +14,11 @@ #include "chrome/browser/ui/browser.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/notification_details.h" -#include "chrome/common/notification_type.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/common/notification_details.h" +#include "content/common/notification_type.h" #include "net/base/net_util.h" // This file contains high-level startup tests for the extensions system. We've diff --git a/chrome/browser/extensions/extension_tabs_module.cc b/chrome/browser/extensions/extension_tabs_module.cc index adacac6..a66e300 100644 --- a/chrome/browser/extensions/extension_tabs_module.cc +++ b/chrome/browser/extensions/extension_tabs_module.cc @@ -16,8 +16,8 @@ #include "chrome/browser/browser_window.h" #include "chrome/browser/extensions/extension_function_dispatcher.h" #include "chrome/browser/extensions/extension_host.h" -#include "chrome/browser/extensions/extension_tabs_module_constants.h" #include "chrome/browser/extensions/extension_service.h" +#include "chrome/browser/extensions/extension_tabs_module_constants.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/browser.h" @@ -26,15 +26,15 @@ #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/pref_names.h" #include "chrome/common/url_constants.h" #include "content/browser/renderer_host/backing_store.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/render_view_host_delegate.h" #include "content/browser/tab_contents/navigation_entry.h" -#include "content/browser/tab_contents/tab_contents_view.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/browser/tab_contents/tab_contents_view.h" +#include "content/common/notification_service.h" #include "skia/ext/image_operations.h" #include "skia/ext/platform_canvas.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/extensions/extension_tabs_module.h b/chrome/browser/extensions/extension_tabs_module.h index 7125867..9e48256 100644 --- a/chrome/browser/extensions/extension_tabs_module.h +++ b/chrome/browser/extensions/extension_tabs_module.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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 <string> #include "chrome/browser/extensions/extension_function.h" -#include "chrome/common/notification_observer.h" -#include "chrome/common/notification_registrar.h" +#include "content/common/notification_observer.h" +#include "content/common/notification_registrar.h" class BackingStore; class Browser; diff --git a/chrome/browser/extensions/extension_test_api.cc b/chrome/browser/extensions/extension_test_api.cc index 83800b0..721f033 100644 --- a/chrome/browser/extensions/extension_test_api.cc +++ b/chrome/browser/extensions/extension_test_api.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -11,7 +11,7 @@ #include "chrome/browser/extensions/extensions_quota_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" -#include "chrome/common/notification_service.h" +#include "content/common/notification_service.h" namespace { diff --git a/chrome/browser/extensions/extension_test_message_listener.cc b/chrome/browser/extensions/extension_test_message_listener.cc index 8ba0683..444b700 100644 --- a/chrome/browser/extensions/extension_test_message_listener.cc +++ b/chrome/browser/extensions/extension_test_message_listener.cc @@ -1,13 +1,13 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. #include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/extensions/extension_test_api.h" -#include "chrome/common/notification_service.h" -#include "chrome/common/notification_type.h" #include "chrome/test/ui_test_utils.h" +#include "content/common/notification_service.h" +#include "content/common/notification_type.h" ExtensionTestMessageListener::ExtensionTestMessageListener( const std::string& expected_message, diff --git a/chrome/browser/extensions/extension_test_message_listener.h b/chrome/browser/extensions/extension_test_message_listener.h index 86c4cf2..d077472 100644 --- a/chrome/browser/extensions/extension_test_message_listener.h +++ b/chrome/browser/extensions/extension_test_message_listener.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -8,8 +8,8 @@ #include <string> -#include "chrome/common/notification_observer.h" -#include "chrome/common/notification_registrar.h" +#include "content/common/notification_observer.h" +#include "content/common/notification_registrar.h" class ExtensionTestSendMessageFunction; diff --git a/chrome/browser/extensions/extension_toolbar_model.cc b/chrome/browser/extensions/extension_toolbar_model.cc index 3979cbf..11bfeb7 100644 --- a/chrome/browser/extensions/extension_toolbar_model.cc +++ b/chrome/browser/extensions/extension_toolbar_model.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/extension.h" -#include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" +#include "content/common/notification_service.h" ExtensionToolbarModel::ExtensionToolbarModel(ExtensionService* service) : service_(service), diff --git a/chrome/browser/extensions/extension_toolbar_model.h b/chrome/browser/extensions/extension_toolbar_model.h index f782c05..5b5ba4b 100644 --- a/chrome/browser/extensions/extension_toolbar_model.h +++ b/chrome/browser/extensions/extension_toolbar_model.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -8,8 +8,8 @@ #include "base/observer_list.h" #include "chrome/common/extensions/extension.h" -#include "chrome/common/notification_observer.h" -#include "chrome/common/notification_registrar.h" +#include "content/common/notification_observer.h" +#include "content/common/notification_registrar.h" class ExtensionService; class PrefService; diff --git a/chrome/browser/extensions/extension_webnavigation_api.cc b/chrome/browser/extensions/extension_webnavigation_api.cc index 5a52612..8d7873c 100644 --- a/chrome/browser/extensions/extension_webnavigation_api.cc +++ b/chrome/browser/extensions/extension_webnavigation_api.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -14,12 +14,12 @@ #include "chrome/browser/extensions/extension_tabs_module.h" #include "chrome/browser/extensions/extension_webnavigation_api_constants.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/notification_service.h" #include "chrome/common/render_messages_params.h" #include "chrome/common/url_constants.h" #include "content/browser/tab_contents/navigation_controller.h" #include "content/browser/tab_contents/provisional_load_details.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/common/notification_service.h" #include "net/base/net_errors.h" namespace keys = extension_webnavigation_api_constants; diff --git a/chrome/browser/extensions/extension_webnavigation_api.h b/chrome/browser/extensions/extension_webnavigation_api.h index 6e4731b..29854aa 100644 --- a/chrome/browser/extensions/extension_webnavigation_api.h +++ b/chrome/browser/extensions/extension_webnavigation_api.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -14,8 +14,8 @@ #include "base/singleton.h" #include "chrome/browser/extensions/extension_function.h" -#include "chrome/common/notification_observer.h" -#include "chrome/common/notification_registrar.h" +#include "content/common/notification_observer.h" +#include "content/common/notification_registrar.h" #include "googleurl/src/gurl.h" class NavigationController; diff --git a/chrome/browser/extensions/extension_webstore_private_api.cc b/chrome/browser/extensions/extension_webstore_private_api.cc index e2963d4..f6369cef 100644 --- a/chrome/browser/extensions/extension_webstore_private_api.cc +++ b/chrome/browser/extensions/extension_webstore_private_api.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -20,10 +20,10 @@ #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_error_utils.h" #include "chrome/common/net/gaia/gaia_constants.h" -#include "chrome/common/notification_details.h" -#include "chrome/common/notification_source.h" -#include "chrome/common/notification_type.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/common/notification_details.h" +#include "content/common/notification_source.h" +#include "content/common/notification_type.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "net/base/escape.h" diff --git a/chrome/browser/extensions/extension_webstore_private_api.h b/chrome/browser/extensions/extension_webstore_private_api.h index 647c8e8..f307f43 100644 --- a/chrome/browser/extensions/extension_webstore_private_api.h +++ b/chrome/browser/extensions/extension_webstore_private_api.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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/browser_signin.h" #include "chrome/browser/extensions/extension_function.h" #include "chrome/common/net/gaia/google_service_auth_error.h" -#include "chrome/common/notification_observer.h" -#include "chrome/common/notification_registrar.h" +#include "content/common/notification_observer.h" +#include "content/common/notification_registrar.h" class ProfileSyncService; diff --git a/chrome/browser/extensions/extensions_ui.cc b/chrome/browser/extensions/extensions_ui.cc index 1b3b080..f83629b 100644 --- a/chrome/browser/extensions/extensions_ui.cc +++ b/chrome/browser/extensions/extensions_ui.cc @@ -12,8 +12,8 @@ #include "base/singleton.h" #include "base/string_number_conversions.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" #include "base/threading/thread.h" +#include "base/utf_string_conversions.h" #include "base/version.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/debugger/devtools_manager.h" @@ -33,18 +33,18 @@ #include "chrome/browser/ui/webui/extension_icon_source.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_icon_set.h" -#include "chrome/common/extensions/user_script.h" #include "chrome/common/extensions/url_pattern.h" +#include "chrome/common/extensions/user_script.h" #include "chrome/common/jstemplate_builder.h" -#include "chrome/common/notification_service.h" -#include "chrome/common/notification_type.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "content/browser/renderer_host/render_process_host.h" -#include "content/browser/renderer_host/render_widget_host.h" #include "content/browser/renderer_host/render_view_host.h" +#include "content/browser/renderer_host/render_widget_host.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_view.h" +#include "content/common/notification_service.h" +#include "content/common/notification_type.h" #include "googleurl/src/gurl.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/extensions/extensions_ui.h b/chrome/browser/extensions/extensions_ui.h index 029840e..37a9d58 100644 --- a/chrome/browser/extensions/extensions_ui.h +++ b/chrome/browser/extensions/extensions_ui.h @@ -15,9 +15,9 @@ #include "chrome/browser/ui/shell_dialogs.h" #include "chrome/browser/ui/webui/chrome_url_data_manager.h" #include "chrome/common/extensions/extension_resource.h" -#include "chrome/common/notification_observer.h" -#include "chrome/common/notification_registrar.h" #include "content/browser/webui/web_ui.h" +#include "content/common/notification_observer.h" +#include "content/common/notification_registrar.h" #include "googleurl/src/gurl.h" class DictionaryValue; diff --git a/chrome/browser/extensions/external_policy_extension_loader.cc b/chrome/browser/extensions/external_policy_extension_loader.cc index bafc28f..9753686 100644 --- a/chrome/browser/extensions/external_policy_extension_loader.cc +++ b/chrome/browser/extensions/external_policy_extension_loader.cc @@ -6,13 +6,13 @@ #include "base/logging.h" #include "base/values.h" -#include "chrome/common/extensions/extension.h" -#include "chrome/common/notification_service.h" -#include "chrome/common/notification_type.h" -#include "chrome/common/pref_names.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/common/extensions/extension.h" +#include "chrome/common/pref_names.h" #include "content/browser/browser_thread.h" +#include "content/common/notification_service.h" +#include "content/common/notification_type.h" #include "googleurl/src/gurl.h" namespace { diff --git a/chrome/browser/extensions/external_policy_extension_loader.h b/chrome/browser/extensions/external_policy_extension_loader.h index 7a78071..3d36b94 100644 --- a/chrome/browser/extensions/external_policy_extension_loader.h +++ b/chrome/browser/extensions/external_policy_extension_loader.h @@ -9,8 +9,8 @@ #include "chrome/browser/extensions/external_extension_loader.h" #include "chrome/browser/prefs/pref_change_registrar.h" -#include "chrome/common/notification_observer.h" -#include "chrome/common/notification_registrar.h" +#include "content/common/notification_observer.h" +#include "content/common/notification_registrar.h" class ListValue; class MockExternalPolicyExtensionProviderVisitor; diff --git a/chrome/browser/extensions/image_loading_tracker.cc b/chrome/browser/extensions/image_loading_tracker.cc index 9f18b52..68fbe13 100644 --- a/chrome/browser/extensions/image_loading_tracker.cc +++ b/chrome/browser/extensions/image_loading_tracker.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -7,9 +7,9 @@ #include "base/file_util.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_resource.h" -#include "chrome/common/notification_service.h" -#include "chrome/common/notification_type.h" #include "content/browser/browser_thread.h" +#include "content/common/notification_service.h" +#include "content/common/notification_type.h" #include "skia/ext/image_operations.h" #include "third_party/skia/include/core/SkBitmap.h" #include "webkit/glue/image_decoder.h" diff --git a/chrome/browser/extensions/image_loading_tracker.h b/chrome/browser/extensions/image_loading_tracker.h index 0ce3703..5c9d43f 100644 --- a/chrome/browser/extensions/image_loading_tracker.h +++ b/chrome/browser/extensions/image_loading_tracker.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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 <map> #include "base/ref_counted.h" -#include "chrome/common/notification_observer.h" -#include "chrome/common/notification_registrar.h" +#include "content/common/notification_observer.h" +#include "content/common/notification_registrar.h" class Extension; class ExtensionResource; diff --git a/chrome/browser/extensions/image_loading_tracker_unittest.cc b/chrome/browser/extensions/image_loading_tracker_unittest.cc index e43d8d5..f196b55 100644 --- a/chrome/browser/extensions/image_loading_tracker_unittest.cc +++ b/chrome/browser/extensions/image_loading_tracker_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -10,9 +10,9 @@ #include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/extension_resource.h" #include "chrome/common/json_value_serializer.h" -#include "chrome/common/notification_service.h" -#include "chrome/common/notification_type.h" #include "content/browser/browser_thread.h" +#include "content/common/notification_service.h" +#include "content/common/notification_type.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/size.h" diff --git a/chrome/browser/extensions/theme_installed_infobar_delegate.cc b/chrome/browser/extensions/theme_installed_infobar_delegate.cc index 4d2fd5d..ea27cd9 100644 --- a/chrome/browser/extensions/theme_installed_infobar_delegate.cc +++ b/chrome/browser/extensions/theme_installed_infobar_delegate.cc @@ -11,8 +11,8 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/common/extensions/extension.h" -#include "chrome/common/notification_service.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/common/notification_service.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/extensions/theme_installed_infobar_delegate.h b/chrome/browser/extensions/theme_installed_infobar_delegate.h index 0eb0d3d..d3eaeb6 100644 --- a/chrome/browser/extensions/theme_installed_infobar_delegate.h +++ b/chrome/browser/extensions/theme_installed_infobar_delegate.h @@ -7,7 +7,7 @@ #pragma once #include "chrome/browser/tab_contents/confirm_infobar_delegate.h" -#include "chrome/common/notification_registrar.h" +#include "content/common/notification_registrar.h" class Extension; class SkBitmap; diff --git a/chrome/browser/extensions/user_script_listener.cc b/chrome/browser/extensions/user_script_listener.cc index 6f69503..8247d87 100644 --- a/chrome/browser/extensions/user_script_listener.cc +++ b/chrome/browser/extensions/user_script_listener.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -8,10 +8,10 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/url_pattern.h" -#include "chrome/common/notification_service.h" #include "content/browser/browser_thread.h" #include "content/browser/renderer_host/global_request_id.h" #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" +#include "content/common/notification_service.h" #include "net/url_request/url_request.h" UserScriptListener::UserScriptListener(ResourceQueue* resource_queue) diff --git a/chrome/browser/extensions/user_script_listener.h b/chrome/browser/extensions/user_script_listener.h index 94474c4..a81cd3b 100644 --- a/chrome/browser/extensions/user_script_listener.h +++ b/chrome/browser/extensions/user_script_listener.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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,9 +9,9 @@ #include <list> #include "base/ref_counted.h" -#include "chrome/common/notification_observer.h" -#include "chrome/common/notification_registrar.h" #include "content/browser/renderer_host/resource_queue.h" +#include "content/common/notification_observer.h" +#include "content/common/notification_registrar.h" namespace net { class URLRequest; diff --git a/chrome/browser/extensions/user_script_listener_unittest.cc b/chrome/browser/extensions/user_script_listener_unittest.cc index 12010de..bf5d952 100644 --- a/chrome/browser/extensions/user_script_listener_unittest.cc +++ b/chrome/browser/extensions/user_script_listener_unittest.cc @@ -8,12 +8,12 @@ #include "chrome/browser/extensions/user_script_listener.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension_file_util.h" -#include "chrome/common/notification_service.h" -#include "chrome/common/notification_type.h" #include "content/browser/renderer_host/global_request_id.h" #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" #include "content/browser/renderer_host/resource_handler.h" #include "content/browser/renderer_host/resource_queue.h" +#include "content/common/notification_service.h" +#include "content/common/notification_type.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_test_job.h" #include "net/url_request/url_request_test_util.h" diff --git a/chrome/browser/extensions/user_script_master.cc b/chrome/browser/extensions/user_script_master.cc index c62f452..9bf98df 100644 --- a/chrome/browser/extensions/user_script_master.cc +++ b/chrome/browser/extensions/user_script_master.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -19,8 +19,8 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_resource.h" -#include "chrome/common/notification_service.h" #include "chrome/common/url_constants.h" +#include "content/common/notification_service.h" #include "net/base/net_util.h" diff --git a/chrome/browser/extensions/user_script_master.h b/chrome/browser/extensions/user_script_master.h index a0010d5..1964199 100644 --- a/chrome/browser/extensions/user_script_master.h +++ b/chrome/browser/extensions/user_script_master.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -11,9 +11,9 @@ #include "base/scoped_ptr.h" #include "base/shared_memory.h" #include "chrome/common/extensions/user_script.h" -#include "chrome/common/notification_observer.h" -#include "chrome/common/notification_registrar.h" #include "content/browser/browser_thread.h" +#include "content/common/notification_observer.h" +#include "content/common/notification_registrar.h" namespace base { class StringPiece; diff --git a/chrome/browser/extensions/user_script_master_unittest.cc b/chrome/browser/extensions/user_script_master_unittest.cc index 0468b73..2bbfa66 100644 --- a/chrome/browser/extensions/user_script_master_unittest.cc +++ b/chrome/browser/extensions/user_script_master_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -11,10 +11,10 @@ #include "base/message_loop.h" #include "base/path_service.h" #include "base/string_util.h" -#include "chrome/common/notification_registrar.h" -#include "chrome/common/notification_service.h" #include "chrome/test/testing_profile.h" #include "content/browser/browser_thread.h" +#include "content/common/notification_registrar.h" +#include "content/common/notification_service.h" #include "testing/gtest/include/gtest/gtest.h" // Test bringing up a master on a specific directory, putting a script diff --git a/chrome/browser/external_tab_container_win.cc b/chrome/browser/external_tab_container_win.cc index 494a8e1..629114d 100644 --- a/chrome/browser/external_tab_container_win.cc +++ b/chrome/browser/external_tab_container_win.cc @@ -13,8 +13,8 @@ #include "base/win/win_util.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/app/chrome_dll_resource.h" -#include "chrome/browser/automation/automation_provider.h" #include "chrome/browser/automation/automation_extension_function.h" +#include "chrome/browser/automation/automation_provider.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/debugger/devtools_manager.h" #include "chrome/browser/debugger/devtools_toggle_action.h" @@ -32,16 +32,16 @@ #include "chrome/common/automation_messages.h" #include "chrome/common/bindings_policy.h" #include "chrome/common/chrome_constants.h" -#include "chrome/common/render_messages.h" -#include "chrome/common/render_messages_params.h" #include "chrome/common/native_web_keyboard_event.h" -#include "chrome/common/notification_service.h" #include "chrome/common/page_transition_types.h" +#include "chrome/common/render_messages.h" +#include "chrome/common/render_messages_params.h" #include "chrome/common/url_constants.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" #include "content/browser/tab_contents/provisional_load_details.h" +#include "content/common/notification_service.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/external_tab_container_win.h b/chrome/browser/external_tab_container_win.h index b4954c0..a7793a6 100644 --- a/chrome/browser/external_tab_container_win.h +++ b/chrome/browser/external_tab_container_win.h @@ -18,9 +18,9 @@ #include "chrome/browser/ui/views/infobars/infobar_container.h" #include "chrome/browser/ui/views/unhandled_keyboard_event_handler.h" #include "chrome/common/navigation_types.h" -#include "chrome/common/notification_observer.h" -#include "chrome/common/notification_registrar.h" #include "content/browser/tab_contents/tab_contents_delegate.h" +#include "content/common/notification_observer.h" +#include "content/common/notification_registrar.h" #include "views/accelerator.h" #include "views/widget/widget_win.h" diff --git a/chrome/browser/file_select_helper.cc b/chrome/browser/file_select_helper.cc index f9d24d11..81616d5 100644 --- a/chrome/browser/file_select_helper.cc +++ b/chrome/browser/file_select_helper.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -10,15 +10,15 @@ #include "base/string_split.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "net/base/mime_util.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/notification_details.h" -#include "chrome/common/notification_source.h" #include "chrome/common/render_messages_params.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/render_widget_host_view.h" +#include "content/common/notification_details.h" +#include "content/common/notification_source.h" #include "grit/generated_resources.h" +#include "net/base/mime_util.h" #include "ui/base/l10n/l10n_util.h" FileSelectHelper::FileSelectHelper(Profile* profile) diff --git a/chrome/browser/file_select_helper.h b/chrome/browser/file_select_helper.h index 10d7260..5a2b4d6 100644 --- a/chrome/browser/file_select_helper.h +++ b/chrome/browser/file_select_helper.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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 <vector> #include "chrome/browser/ui/shell_dialogs.h" -#include "chrome/common/notification_observer.h" -#include "chrome/common/notification_registrar.h" +#include "content/common/notification_observer.h" +#include "content/common/notification_registrar.h" #include "net/base/directory_lister.h" class Profile; diff --git a/chrome/browser/first_run/first_run_win.cc b/chrome/browser/first_run/first_run_win.cc index 6002a3f..6b16485 100644 --- a/chrome/browser/first_run/first_run_win.cc +++ b/chrome/browser/first_run/first_run_win.cc @@ -4,9 +4,9 @@ #include "chrome/browser/first_run/first_run.h" -#include <windows.h> #include <shellapi.h> #include <shlobj.h> +#include <windows.h> #include <set> #include <sstream> @@ -33,7 +33,6 @@ #include "chrome/browser/ui/views/first_run_search_engine_view.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/notification_service.h" #include "chrome/common/worker_thread_ticker.h" #include "chrome/installer/util/browser_distribution.h" #include "chrome/installer/util/google_update_constants.h" @@ -41,11 +40,15 @@ #include "chrome/installer/util/install_util.h" #include "chrome/installer/util/shell_util.h" #include "chrome/installer/util/util_constants.h" +#include "content/common/notification_service.h" #include "google_update_idl.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" +#include "ui/base/l10n/l10n_util.h" +#include "ui/base/resource/resource_bundle.h" +#include "ui/base/ui_base_switches.h" #include "views/controls/button/image_button.h" #include "views/controls/button/radio_button.h" #include "views/controls/image_view.h" @@ -56,9 +59,6 @@ #include "views/widget/root_view.h" #include "views/widget/widget_win.h" #include "views/window/window.h" -#include "ui/base/resource/resource_bundle.h" -#include "ui/base/l10n/l10n_util.h" -#include "ui/base/ui_base_switches.h" namespace { diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc index 9d26979..01a43400 100644 --- a/chrome/browser/geolocation/geolocation_browsertest.cc +++ b/chrome/browser/geolocation/geolocation_browsertest.cc @@ -15,9 +15,6 @@ #include "chrome/browser/ui/browser.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/geoposition.h" -#include "chrome/common/notification_details.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" #include "content/browser/geolocation/arbitrator_dependency_factories_for_test.h" @@ -25,6 +22,9 @@ #include "content/browser/geolocation/mock_location_provider.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/common/notification_details.h" +#include "content/common/notification_service.h" +#include "content/common/notification_type.h" #include "net/base/net_util.h" #include "net/test/test_server.h" diff --git a/chrome/browser/geolocation/geolocation_content_settings_map.cc b/chrome/browser/geolocation/geolocation_content_settings_map.cc index ad17257..afeeb6e 100644 --- a/chrome/browser/geolocation/geolocation_content_settings_map.cc +++ b/chrome/browser/geolocation/geolocation_content_settings_map.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -24,12 +24,12 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/profiles/profile.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/common/url_constants.h" #include "content/browser/browser_thread.h" +#include "content/common/notification_service.h" +#include "content/common/notification_source.h" +#include "content/common/notification_type.h" #include "net/base/dns_util.h" #include "net/base/static_cookie_policy.h" diff --git a/chrome/browser/geolocation/geolocation_content_settings_map.h b/chrome/browser/geolocation/geolocation_content_settings_map.h index 74a74fa..bca703e 100644 --- a/chrome/browser/geolocation/geolocation_content_settings_map.h +++ b/chrome/browser/geolocation/geolocation_content_settings_map.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -19,8 +19,8 @@ #include "base/ref_counted.h" #include "chrome/browser/prefs/pref_change_registrar.h" #include "chrome/common/content_settings.h" -#include "chrome/common/notification_observer.h" -#include "chrome/common/notification_registrar.h" +#include "content/common/notification_observer.h" +#include "content/common/notification_registrar.h" #include "googleurl/src/gurl.h" class ContentSettingsDetails; diff --git a/chrome/browser/geolocation/geolocation_content_settings_map_unittest.cc b/chrome/browser/geolocation/geolocation_content_settings_map_unittest.cc index ea677a9..8f77158 100644 --- a/chrome/browser/geolocation/geolocation_content_settings_map_unittest.cc +++ b/chrome/browser/geolocation/geolocation_content_settings_map_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -6,11 +6,11 @@ #include "chrome/browser/content_settings/content_settings_details.h" #include "chrome/browser/geolocation/geolocation_content_settings_map.h" #include "chrome/browser/prefs/pref_service.h" -#include "chrome/common/notification_registrar.h" -#include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "chrome/test/testing_profile.h" #include "content/browser/browser_thread.h" +#include "content/common/notification_registrar.h" +#include "content/common/notification_service.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/geolocation/geolocation_permission_context.cc b/chrome/browser/geolocation/geolocation_permission_context.cc index d98841f..564bbdf 100644 --- a/chrome/browser/geolocation/geolocation_permission_context.cc +++ b/chrome/browser/geolocation/geolocation_permission_context.cc @@ -17,9 +17,6 @@ #include "chrome/browser/tab_contents/confirm_infobar_delegate.h" #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/common/extensions/extension.h" -#include "chrome/common/notification_registrar.h" -#include "chrome/common/notification_source.h" -#include "chrome/common/notification_type.h" #include "chrome/common/pref_names.h" #include "chrome/common/render_messages.h" #include "content/browser/browser_thread.h" @@ -27,6 +24,9 @@ #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/common/notification_registrar.h" +#include "content/common/notification_source.h" +#include "content/common/notification_type.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/geolocation/geolocation_permission_context_unittest.cc b/chrome/browser/geolocation/geolocation_permission_context_unittest.cc index d96cb7f..c80b50a 100644 --- a/chrome/browser/geolocation/geolocation_permission_context_unittest.cc +++ b/chrome/browser/geolocation/geolocation_permission_context_unittest.cc @@ -5,8 +5,6 @@ #include "base/scoped_vector.h" #include "chrome/browser/geolocation/geolocation_content_settings_map.h" #include "chrome/browser/tab_contents/confirm_infobar_delegate.h" -#include "chrome/common/notification_details.h" -#include "chrome/common/notification_type.h" #include "chrome/common/render_messages.h" #include "chrome/test/testing_profile.h" #include "content/browser/browser_thread.h" @@ -18,6 +16,8 @@ #include "content/browser/renderer_host/mock_render_process_host.h" #include "content/browser/renderer_host/test_render_view_host.h" #include "content/browser/tab_contents/test_tab_contents.h" +#include "content/common/notification_details.h" +#include "content/common/notification_type.h" #include "testing/gtest/include/gtest/gtest.h" // TestTabContentsWithPendingInfoBar ------------------------------------------ diff --git a/chrome/browser/google/google_url_tracker.cc b/chrome/browser/google/google_url_tracker.cc index 1b2c686..206cf0e 100644 --- a/chrome/browser/google/google_url_tracker.cc +++ b/chrome/browser/google/google_url_tracker.cc @@ -15,10 +15,10 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "content/browser/tab_contents/navigation_controller.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/common/notification_service.h" #include "grit/generated_resources.h" #include "net/base/load_flags.h" #include "net/url_request/url_request_status.h" diff --git a/chrome/browser/google/google_url_tracker.h b/chrome/browser/google/google_url_tracker.h index bfac848..0cf6d4e 100644 --- a/chrome/browser/google/google_url_tracker.h +++ b/chrome/browser/google/google_url_tracker.h @@ -12,8 +12,8 @@ #include "base/scoped_ptr.h" #include "chrome/browser/tab_contents/confirm_infobar_delegate.h" #include "chrome/common/net/url_fetcher.h" -#include "chrome/common/notification_observer.h" -#include "chrome/common/notification_registrar.h" +#include "content/common/notification_observer.h" +#include "content/common/notification_registrar.h" #include "googleurl/src/gurl.h" #include "net/base/network_change_notifier.h" diff --git a/chrome/browser/google/google_url_tracker_unittest.cc b/chrome/browser/google/google_url_tracker_unittest.cc index 1da9fa6..149720b 100644 --- a/chrome/browser/google/google_url_tracker_unittest.cc +++ b/chrome/browser/google/google_url_tracker_unittest.cc @@ -13,12 +13,12 @@ #include "chrome/common/net/test_url_fetcher_factory.h" #include "chrome/common/net/url_fetcher.h" #include "chrome/common/net/url_request_context_getter.h" -#include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "chrome/test/testing_browser_process.h" #include "chrome/test/testing_pref_service.h" #include "chrome/test/testing_profile.h" #include "content/browser/browser_thread.h" +#include "content/common/notification_service.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_test_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/history/expire_history_backend.cc b/chrome/browser/history/expire_history_backend.cc index e160635..384c398 100644 --- a/chrome/browser/history/expire_history_backend.cc +++ b/chrome/browser/history/expire_history_backend.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -17,7 +17,7 @@ #include "chrome/browser/history/text_database.h" #include "chrome/browser/history/text_database_manager.h" #include "chrome/browser/history/thumbnail_database.h" -#include "chrome/common/notification_type.h" +#include "content/common/notification_type.h" using base::Time; using base::TimeDelta; diff --git a/chrome/browser/history/history.cc b/chrome/browser/history/history.cc index d74e889..d097f09 100644 --- a/chrome/browser/history/history.cc +++ b/chrome/browser/history/history.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -45,11 +45,11 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/visitedlink/visitedlink_master.h" #include "chrome/common/chrome_constants.h" -#include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "chrome/common/thumbnail_score.h" #include "chrome/common/url_constants.h" #include "content/browser/browser_thread.h" +#include "content/common/notification_service.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/history/history.h b/chrome/browser/history/history.h index ce0d29e..f23c34f 100644 --- a/chrome/browser/history/history.h +++ b/chrome/browser/history/history.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -19,11 +19,11 @@ #include "chrome/browser/favicon_service.h" #include "chrome/browser/history/history_types.h" #include "chrome/browser/search_engines/template_url_id.h" -#include "chrome/common/notification_observer.h" -#include "chrome/common/notification_registrar.h" #include "chrome/common/page_transition_types.h" #include "chrome/common/ref_counted_util.h" #include "content/browser/cancelable_request.h" +#include "content/common/notification_observer.h" +#include "content/common/notification_registrar.h" class BookmarkService; struct DownloadCreateInfo; diff --git a/chrome/browser/history/history_backend.cc b/chrome/browser/history/history_backend.cc index 015991a..b303dc12 100644 --- a/chrome/browser/history/history_backend.cc +++ b/chrome/browser/history/history_backend.cc @@ -12,8 +12,8 @@ #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/file_util.h" -#include "base/metrics/histogram.h" #include "base/message_loop.h" +#include "base/metrics/histogram.h" #include "base/scoped_ptr.h" #include "base/scoped_vector.h" #include "base/string_util.h" @@ -27,8 +27,8 @@ #include "chrome/browser/history/page_usage_data.h" #include "chrome/browser/history/top_sites.h" #include "chrome/common/chrome_constants.h" -#include "chrome/common/notification_type.h" #include "chrome/common/url_constants.h" +#include "content/common/notification_type.h" #include "googleurl/src/gurl.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/history/history_backend_unittest.cc b/chrome/browser/history/history_backend_unittest.cc index b72ed5a..72f5264 100644 --- a/chrome/browser/history/history_backend_unittest.cc +++ b/chrome/browser/history/history_backend_unittest.cc @@ -1,13 +1,13 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. #include <set> #include <vector> +#include "base/command_line.h" #include "base/file_path.h" #include "base/file_util.h" -#include "base/command_line.h" #include "base/path_service.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" @@ -16,14 +16,14 @@ #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/history/history_backend.h" #include "chrome/browser/history/history_notifications.h" -#include "chrome/browser/history/in_memory_history_backend.h" #include "chrome/browser/history/in_memory_database.h" +#include "chrome/browser/history/in_memory_history_backend.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.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 "content/common/notification_details.h" +#include "content/common/notification_source.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/codec/jpeg_codec.h" diff --git a/chrome/browser/history/history_unittest.cc b/chrome/browser/history/history_unittest.cc index 7bc76da..2ce5a96 100644 --- a/chrome/browser/history/history_unittest.cc +++ b/chrome/browser/history/history_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -46,10 +46,10 @@ #include "chrome/browser/history/in_memory_history_backend.h" #include "chrome/browser/history/page_usage_data.h" #include "chrome/common/chrome_paths.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 "content/common/notification_details.h" +#include "content/common/notification_source.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/codec/jpeg_codec.h" diff --git a/chrome/browser/history/in_memory_history_backend.cc b/chrome/browser/history/in_memory_history_backend.cc index 937e861..f87e838 100644 --- a/chrome/browser/history/in_memory_history_backend.cc +++ b/chrome/browser/history/in_memory_history_backend.cc @@ -17,8 +17,8 @@ #include "chrome/browser/history/url_database.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/notification_details.h" -#include "chrome/common/notification_source.h" +#include "content/common/notification_details.h" +#include "content/common/notification_source.h" namespace history { diff --git a/chrome/browser/history/in_memory_history_backend.h b/chrome/browser/history/in_memory_history_backend.h index 026fd7e..8b6aaaf 100644 --- a/chrome/browser/history/in_memory_history_backend.h +++ b/chrome/browser/history/in_memory_history_backend.h @@ -19,8 +19,8 @@ #include "base/basictypes.h" #include "base/gtest_prod_util.h" #include "base/scoped_ptr.h" -#include "chrome/common/notification_observer.h" -#include "chrome/common/notification_registrar.h" +#include "content/common/notification_observer.h" +#include "content/common/notification_registrar.h" class FilePath; class GURL; diff --git a/chrome/browser/history/top_sites.cc b/chrome/browser/history/top_sites.cc index 306070f..df711ed 100644 --- a/chrome/browser/history/top_sites.cc +++ b/chrome/browser/history/top_sites.cc @@ -22,12 +22,12 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/most_visited_handler.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "chrome/common/thumbnail_score.h" #include "content/browser/browser_thread.h" #include "content/browser/tab_contents/navigation_controller.h" #include "content/browser/tab_contents/navigation_entry.h" +#include "content/common/notification_service.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/importer/importer.cc b/chrome/browser/importer/importer.cc index dd3aeeb..30957fb 100644 --- a/chrome/browser/importer/importer.cc +++ b/chrome/browser/importer/importer.cc @@ -19,10 +19,10 @@ #include "chrome/browser/ui/browser_dialogs.h" #include "chrome/browser/ui/browser_navigator.h" #include "chrome/browser/webdata/web_data_service.h" -#include "chrome/common/notification_source.h" #include "content/browser/browser_thread.h" #include "content/browser/browsing_instance.h" #include "content/browser/site_instance.h" +#include "content/common/notification_source.h" #include "grit/generated_resources.h" #include "skia/ext/image_operations.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/importer/importer.h b/chrome/browser/importer/importer.h index 29b294e..b0b5d78 100644 --- a/chrome/browser/importer/importer.h +++ b/chrome/browser/importer/importer.h @@ -18,8 +18,8 @@ #include "chrome/browser/importer/importer_list.h" #include "chrome/browser/importer/profile_writer.h" #include "chrome/browser/profile_import_process_host.h" -#include "chrome/common/notification_observer.h" -#include "chrome/common/notification_registrar.h" +#include "content/common/notification_observer.h" +#include "content/common/notification_registrar.h" #include "ui/gfx/native_widget_types.h" class ExternalProcessImporterClient; diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer/profile_writer.cc index c5e752c..4c7bed8 100644 --- a/chrome/browser/importer/profile_writer.cc +++ b/chrome/browser/importer/profile_writer.cc @@ -14,8 +14,8 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_model.h" -#include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" +#include "content/common/notification_service.h" using webkit_glue::PasswordForm; diff --git a/chrome/browser/instant/instant_controller.cc b/chrome/browser/instant/instant_controller.cc index f0dbe53..c556dff 100644 --- a/chrome/browser/instant/instant_controller.cc +++ b/chrome/browser/instant/instant_controller.cc @@ -4,10 +4,10 @@ #include "chrome/browser/instant/instant_controller.h" -#include "build/build_config.h" #include "base/command_line.h" #include "base/message_loop.h" #include "base/metrics/histogram.h" +#include "build/build_config.h" #include "chrome/browser/autocomplete/autocomplete_match.h" #include "chrome/browser/instant/instant_delegate.h" #include "chrome/browser/instant/instant_loader.h" @@ -20,11 +20,11 @@ #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "content/browser/renderer_host/render_widget_host_view.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/common/notification_service.h" // Number of ms to delay between loading urls. static const int kUpdateDelayMS = 200; diff --git a/chrome/browser/instant/instant_loader.cc b/chrome/browser/instant/instant_loader.cc index 74700c8..3840e65 100644 --- a/chrome/browser/instant/instant_loader.cc +++ b/chrome/browser/instant/instant_loader.cc @@ -21,12 +21,6 @@ #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_switches.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/notification_type.h" #include "chrome/common/page_transition_types.h" #include "chrome/common/render_messages.h" #include "chrome/common/renderer_preferences.h" @@ -38,6 +32,12 @@ #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_delegate.h" #include "content/browser/tab_contents/tab_contents_view.h" +#include "content/common/notification_details.h" +#include "content/common/notification_observer.h" +#include "content/common/notification_registrar.h" +#include "content/common/notification_service.h" +#include "content/common/notification_source.h" +#include "content/common/notification_type.h" #include "net/http/http_util.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/codec/png_codec.h" diff --git a/chrome/browser/instant/instant_loader.h b/chrome/browser/instant/instant_loader.h index 4a1fc3e..aaae7bf 100644 --- a/chrome/browser/instant/instant_loader.h +++ b/chrome/browser/instant/instant_loader.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -12,9 +12,9 @@ #include "base/timer.h" #include "chrome/browser/instant/instant_commit_type.h" #include "chrome/browser/search_engines/template_url_id.h" -#include "chrome/common/notification_observer.h" -#include "chrome/common/notification_registrar.h" #include "chrome/common/page_transition_types.h" +#include "content/common/notification_observer.h" +#include "content/common/notification_registrar.h" #include "googleurl/src/gurl.h" #include "ui/gfx/rect.h" diff --git a/chrome/browser/intranet_redirect_detector.cc b/chrome/browser/intranet_redirect_detector.cc index 7a5eef7..d858a2f 100644 --- a/chrome/browser/intranet_redirect_detector.cc +++ b/chrome/browser/intranet_redirect_detector.cc @@ -12,8 +12,8 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" +#include "content/common/notification_service.h" #include "net/base/load_flags.h" #include "net/base/net_errors.h" #include "net/base/registry_controlled_domain.h" diff --git a/chrome/browser/intranet_redirect_detector.h b/chrome/browser/intranet_redirect_detector.h index 9366d6f..e54566b2 100644 --- a/chrome/browser/intranet_redirect_detector.h +++ b/chrome/browser/intranet_redirect_detector.h @@ -11,8 +11,8 @@ #include <vector> #include "chrome/common/net/url_fetcher.h" -#include "chrome/common/notification_observer.h" -#include "chrome/common/notification_registrar.h" +#include "content/common/notification_observer.h" +#include "content/common/notification_registrar.h" #include "googleurl/src/gurl.h" #include "net/base/host_resolver_proc.h" #include "net/base/network_change_notifier.h" diff --git a/chrome/browser/mach_broker_mac.cc b/chrome/browser/mach_broker_mac.cc index 18d0341..e311895 100644 --- a/chrome/browser/mach_broker_mac.cc +++ b/chrome/browser/mach_broker_mac.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -13,9 +13,9 @@ #include "chrome/browser/extensions/extension_host.h" #include "chrome/common/child_process_info.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/notification_service.h" #include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_process_host.h" +#include "content/common/notification_service.h" namespace { // Prints a string representation of a Mach error code. diff --git a/chrome/browser/mach_broker_mac.h b/chrome/browser/mach_broker_mac.h index 87107b5..de5160b 100644 --- a/chrome/browser/mach_broker_mac.h +++ b/chrome/browser/mach_broker_mac.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -15,8 +15,8 @@ #include "base/process_util.h" #include "base/singleton.h" #include "base/synchronization/lock.h" -#include "chrome/common/notification_observer.h" -#include "chrome/common/notification_registrar.h" +#include "content/common/notification_observer.h" +#include "content/common/notification_registrar.h" // On OS X, the mach_port_t of a process is required to collect metrics about // the process. Running |task_for_pid()| is only allowed for privileged code. diff --git a/chrome/browser/memory_purger.cc b/chrome/browser/memory_purger.cc index d5716d1..c817ac3 100644 --- a/chrome/browser/memory_purger.cc +++ b/chrome/browser/memory_purger.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -14,12 +14,12 @@ #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/webdata/web_data_service.h" #include "chrome/common/net/url_request_context_getter.h" -#include "chrome/common/notification_service.h" #include "chrome/common/render_messages.h" #include "content/browser/in_process_webkit/webkit_context.h" #include "content/browser/renderer_host/backing_store_manager.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" +#include "content/common/notification_service.h" #include "net/proxy/proxy_resolver.h" #include "net/url_request/url_request_context.h" #include "third_party/tcmalloc/chromium/src/google/malloc_extension.h" diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc index 9c21971..601ad82 100644 --- a/chrome/browser/metrics/metrics_service.cc +++ b/chrome/browser/metrics/metrics_service.cc @@ -161,8 +161,8 @@ #include "base/md5.h" #include "base/metrics/histogram.h" #include "base/string_number_conversions.h" -#include "base/threading/thread.h" #include "base/threading/platform_thread.h" +#include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/bookmarks/bookmark_model.h" @@ -179,13 +179,13 @@ #include "chrome/common/child_process_logging.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/guid.h" -#include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "chrome/common/render_messages.h" #include "content/browser/renderer_host/render_process_host.h" +#include "content/common/notification_service.h" +#include "libxml/xmlwriter.h" #include "webkit/plugins/npapi/plugin_list.h" #include "webkit/plugins/npapi/webplugininfo.h" -#include "libxml/xmlwriter.h" // TODO(port): port browser_distribution.h. #if !defined(OS_POSIX) diff --git a/chrome/browser/metrics/metrics_service.h b/chrome/browser/metrics/metrics_service.h index 48e2cd1..a8f386e 100644 --- a/chrome/browser/metrics/metrics_service.h +++ b/chrome/browser/metrics/metrics_service.h @@ -18,8 +18,8 @@ #include "base/scoped_ptr.h" #include "chrome/common/metrics_helpers.h" #include "chrome/common/net/url_fetcher.h" -#include "chrome/common/notification_observer.h" -#include "chrome/common/notification_registrar.h" +#include "content/common/notification_observer.h" +#include "content/common/notification_registrar.h" #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/external_metrics.h" diff --git a/chrome/browser/metrics/thread_watcher.cc b/chrome/browser/metrics/thread_watcher.cc index 84bc71b..b557984 100644 --- a/chrome/browser/metrics/thread_watcher.cc +++ b/chrome/browser/metrics/thread_watcher.cc @@ -6,7 +6,7 @@ #include "build/build_config.h" #include "chrome/browser/metrics/metrics_service.h" #include "chrome/browser/metrics/thread_watcher.h" -#include "chrome/common/notification_service.h" +#include "content/common/notification_service.h" #if defined(OS_WIN) #include <Objbase.h> diff --git a/chrome/browser/metrics/thread_watcher.h b/chrome/browser/metrics/thread_watcher.h index 43768d3..ea7db9e 100644 --- a/chrome/browser/metrics/thread_watcher.h +++ b/chrome/browser/metrics/thread_watcher.h @@ -22,9 +22,9 @@ #include "base/task.h" #include "base/threading/thread.h" #include "base/time.h" -#include "chrome/common/notification_observer.h" -#include "chrome/common/notification_registrar.h" #include "content/browser/browser_thread.h" +#include "content/common/notification_observer.h" +#include "content/common/notification_registrar.h" class CustomThreadWatcher; class ThreadWatcherList; diff --git a/chrome/browser/metrics/user_metrics.cc b/chrome/browser/metrics/user_metrics.cc index ec71601..fadda77 100644 --- a/chrome/browser/metrics/user_metrics.cc +++ b/chrome/browser/metrics/user_metrics.cc @@ -1,12 +1,12 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/notification_service.h" #include "content/browser/browser_thread.h" +#include "content/common/notification_service.h" void UserMetrics::RecordAction(const UserMetricsAction& action, Profile* profile) { diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc index 2b2a40e..e4c9794 100644 --- a/chrome/browser/net/chrome_url_request_context.cc +++ b/chrome/browser/net/chrome_url_request_context.cc @@ -12,9 +12,9 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_io_data.h" #include "chrome/browser/ui/webui/chrome_url_data_manager_backend.h" -#include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "content/browser/browser_thread.h" +#include "content/common/notification_service.h" #include "net/base/cookie_store.h" #include "net/ftp/ftp_transaction_factory.h" #include "net/http/http_transaction_factory.h" diff --git a/chrome/browser/net/gaia/token_service.cc b/chrome/browser/net/gaia/token_service.cc index edc2bc69..5a1a888 100644 --- a/chrome/browser/net/gaia/token_service.cc +++ b/chrome/browser/net/gaia/token_service.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -11,8 +11,8 @@ #include "chrome/common/net/gaia/gaia_auth_fetcher.h" #include "chrome/common/net/gaia/gaia_constants.h" #include "chrome/common/net/url_request_context_getter.h" -#include "chrome/common/notification_service.h" #include "content/browser/browser_thread.h" +#include "content/common/notification_service.h" // Unfortunately kNumServices must be defined in the .h. // TODO(chron): Sync doesn't use the TalkToken anymore so we can stop diff --git a/chrome/browser/net/gaia/token_service.h b/chrome/browser/net/gaia/token_service.h index 35e9e85..d1ad7ee 100644 --- a/chrome/browser/net/gaia/token_service.h +++ b/chrome/browser/net/gaia/token_service.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. // @@ -44,8 +44,8 @@ #include "chrome/common/net/gaia/gaia_auth_consumer.h" #include "chrome/common/net/gaia/gaia_auth_fetcher.h" #include "chrome/common/net/gaia/google_service_auth_error.h" -#include "chrome/common/notification_observer.h" -#include "chrome/common/notification_registrar.h" +#include "content/common/notification_observer.h" +#include "content/common/notification_registrar.h" class URLRequestContextGetter; class Profile; diff --git a/chrome/browser/net/gaia/token_service_unittest.h b/chrome/browser/net/gaia/token_service_unittest.h index 3e19114..eb8c52a 100644 --- a/chrome/browser/net/gaia/token_service_unittest.h +++ b/chrome/browser/net/gaia/token_service_unittest.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. // @@ -12,11 +12,11 @@ #include "chrome/browser/net/gaia/token_service.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" +#include "content/common/notification_details.h" +#include "content/common/notification_source.h" #include "testing/gtest/include/gtest/gtest.h" // TestNotificationTracker doesn't do a deep copy on the notification details. diff --git a/chrome/browser/net/net_pref_observer.cc b/chrome/browser/net/net_pref_observer.cc index edbf95d..48a051c 100644 --- a/chrome/browser/net/net_pref_observer.cc +++ b/chrome/browser/net/net_pref_observer.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -6,9 +6,9 @@ #include "chrome/browser/net/predictor_api.h" #include "chrome/browser/prefs/pref_service.h" -#include "chrome/common/notification_type.h" #include "chrome/common/pref_names.h" #include "content/browser/browser_thread.h" +#include "content/common/notification_type.h" #include "net/http/http_stream_factory.h" NetPrefObserver::NetPrefObserver(PrefService* prefs) { diff --git a/chrome/browser/net/net_pref_observer.h b/chrome/browser/net/net_pref_observer.h index 33b0a97..b5954231 100644 --- a/chrome/browser/net/net_pref_observer.h +++ b/chrome/browser/net/net_pref_observer.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "chrome/browser/prefs/pref_member.h" -#include "chrome/common/notification_observer.h" +#include "content/common/notification_observer.h" // Monitors network-related preferences for changes and applies them. // The supplied PrefService must outlive this NetPrefObserver. diff --git a/chrome/browser/net/predictor_api.cc b/chrome/browser/net/predictor_api.cc index 5a5e9d8..d9a7906 100644 --- a/chrome/browser/net/predictor_api.cc +++ b/chrome/browser/net/predictor_api.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -7,13 +7,13 @@ #include <map> #include <string> -#include "base/metrics/field_trial.h" #include "base/lazy_instance.h" +#include "base/metrics/field_trial.h" #include "base/stl_util-inl.h" #include "base/string_number_conversions.h" +#include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" #include "base/values.h" -#include "base/synchronization/waitable_event.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/io_thread.h" #include "chrome/browser/net/preconnect.h" @@ -24,10 +24,10 @@ #include "chrome/browser/prefs/session_startup_pref.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" -#include "chrome/common/notification_registrar.h" -#include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "content/browser/browser_thread.h" +#include "content/common/notification_registrar.h" +#include "content/common/notification_service.h" #include "net/base/host_resolver.h" #include "net/base/host_resolver_impl.h" diff --git a/chrome/browser/net/pref_proxy_config_service.cc b/chrome/browser/net/pref_proxy_config_service.cc index 33d3a04..43cc925 100644 --- a/chrome/browser/net/pref_proxy_config_service.cc +++ b/chrome/browser/net/pref_proxy_config_service.cc @@ -8,11 +8,11 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/pref_set_observer.h" #include "chrome/browser/prefs/proxy_config_dictionary.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 "content/browser/browser_thread.h" +#include "content/common/notification_details.h" +#include "content/common/notification_source.h" +#include "content/common/notification_type.h" PrefProxyConfigTracker::PrefProxyConfigTracker(PrefService* pref_service) : pref_service_(pref_service) { diff --git a/chrome/browser/net/pref_proxy_config_service.h b/chrome/browser/net/pref_proxy_config_service.h index 661a250..490f06d 100644 --- a/chrome/browser/net/pref_proxy_config_service.h +++ b/chrome/browser/net/pref_proxy_config_service.h @@ -10,7 +10,7 @@ #include "base/observer_list.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" -#include "chrome/common/notification_observer.h" +#include "content/common/notification_observer.h" #include "net/proxy/proxy_config.h" #include "net/proxy/proxy_config_service.h" diff --git a/chrome/browser/net/ssl_config_service_manager_pref.cc b/chrome/browser/net/ssl_config_service_manager_pref.cc index d3eb2a1..2883085 100644 --- a/chrome/browser/net/ssl_config_service_manager_pref.cc +++ b/chrome/browser/net/ssl_config_service_manager_pref.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -10,10 +10,10 @@ #include "chrome/browser/prefs/pref_member.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.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 "content/common/notification_details.h" +#include "content/common/notification_source.h" +#include "content/common/notification_type.h" #include "net/base/ssl_config_service.h" //////////////////////////////////////////////////////////////////////////////// diff --git a/chrome/browser/notifications/balloon_host.cc b/chrome/browser/notifications/balloon_host.cc index ab366df..9dfee2b 100644 --- a/chrome/browser/notifications/balloon_host.cc +++ b/chrome/browser/notifications/balloon_host.cc @@ -11,15 +11,15 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_preferences_util.h" #include "chrome/common/bindings_policy.h" -#include "chrome/common/notification_service.h" -#include "chrome/common/notification_source.h" -#include "chrome/common/notification_type.h" #include "chrome/common/render_messages.h" #include "chrome/common/render_messages_params.h" #include "chrome/common/renderer_preferences.h" #include "chrome/common/url_constants.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/site_instance.h" +#include "content/common/notification_service.h" +#include "content/common/notification_source.h" +#include "content/common/notification_type.h" #include "webkit/glue/webpreferences.h" BalloonHost::BalloonHost(Balloon* balloon) diff --git a/chrome/browser/notifications/balloon_host.h b/chrome/browser/notifications/balloon_host.h index c86060b..2f39301 100644 --- a/chrome/browser/notifications/balloon_host.h +++ b/chrome/browser/notifications/balloon_host.h @@ -11,9 +11,9 @@ #include "chrome/browser/extensions/extension_function_dispatcher.h" #include "chrome/browser/tab_contents/render_view_host_delegate_helper.h" -#include "chrome/common/notification_observer.h" -#include "chrome/common/notification_registrar.h" #include "content/browser/renderer_host/render_view_host_delegate.h" +#include "content/common/notification_observer.h" +#include "content/common/notification_registrar.h" class Balloon; class Browser; diff --git a/chrome/browser/notifications/desktop_notification_service.cc b/chrome/browser/notifications/desktop_notification_service.cc index 76cb345..8fbf096 100644 --- a/chrome/browser/notifications/desktop_notification_service.cc +++ b/chrome/browser/notifications/desktop_notification_service.cc @@ -16,8 +16,6 @@ #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/tab_contents/confirm_infobar_delegate.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" #include "chrome/common/render_messages_params.h" @@ -29,6 +27,8 @@ #include "content/browser/site_instance.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/worker_host/worker_process_host.h" +#include "content/common/notification_service.h" +#include "content/common/notification_type.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/notifications/desktop_notification_service.h b/chrome/browser/notifications/desktop_notification_service.h index e208be3..a939946 100644 --- a/chrome/browser/notifications/desktop_notification_service.h +++ b/chrome/browser/notifications/desktop_notification_service.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -14,8 +14,8 @@ #include "base/string16.h" #include "chrome/browser/prefs/pref_change_registrar.h" #include "chrome/common/content_settings.h" -#include "chrome/common/notification_observer.h" -#include "chrome/common/notification_registrar.h" +#include "content/common/notification_observer.h" +#include "content/common/notification_registrar.h" #include "googleurl/src/gurl.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebTextDirection.h" diff --git a/chrome/browser/notifications/notification_exceptions_table_model.cc b/chrome/browser/notifications/notification_exceptions_table_model.cc index 7a70875..cb4db02 100644 --- a/chrome/browser/notifications/notification_exceptions_table_model.cc +++ b/chrome/browser/notifications/notification_exceptions_table_model.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -8,9 +8,9 @@ #include "chrome/common/content_settings.h" #include "chrome/common/content_settings_helper.h" #include "chrome/common/content_settings_types.h" -#include "chrome/common/notification_service.h" -#include "chrome/common/notification_type.h" #include "chrome/common/url_constants.h" +#include "content/common/notification_service.h" +#include "content/common/notification_type.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/table_model_observer.h" diff --git a/chrome/browser/notifications/notification_exceptions_table_model.h b/chrome/browser/notifications/notification_exceptions_table_model.h index c9e2100..b9dc809 100644 --- a/chrome/browser/notifications/notification_exceptions_table_model.h +++ b/chrome/browser/notifications/notification_exceptions_table_model.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -11,7 +11,7 @@ #include "base/compiler_specific.h" #include "chrome/browser/notifications/desktop_notification_service.h" #include "chrome/browser/remove_rows_table_model.h" -#include "chrome/common/notification_observer.h" +#include "content/common/notification_observer.h" class NotificationExceptionsTableModel : public RemoveRowsTableModel, public NotificationObserver { diff --git a/chrome/browser/notifications/notification_ui_manager.cc b/chrome/browser/notifications/notification_ui_manager.cc index 4829c2f..5b28d1b 100644 --- a/chrome/browser/notifications/notification_ui_manager.cc +++ b/chrome/browser/notifications/notification_ui_manager.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -13,10 +13,10 @@ #include "chrome/browser/notifications/balloon_collection.h" #include "chrome/browser/notifications/notification.h" #include "chrome/browser/prefs/pref_service.h" -#include "chrome/common/notification_service.h" -#include "chrome/common/notification_type.h" #include "chrome/common/pref_names.h" #include "content/browser/site_instance.h" +#include "content/common/notification_service.h" +#include "content/common/notification_type.h" namespace { const int kUserStatePollingIntervalSeconds = 1; diff --git a/chrome/browser/notifications/notification_ui_manager.h b/chrome/browser/notifications/notification_ui_manager.h index 7ac63a2..b0ecded 100644 --- a/chrome/browser/notifications/notification_ui_manager.h +++ b/chrome/browser/notifications/notification_ui_manager.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -15,8 +15,8 @@ #include "chrome/browser/notifications/balloon.h" #include "chrome/browser/notifications/balloon_collection.h" #include "chrome/browser/prefs/pref_member.h" -#include "chrome/common/notification_observer.h" -#include "chrome/common/notification_registrar.h" +#include "content/common/notification_observer.h" +#include "content/common/notification_registrar.h" class Notification; class PrefService; diff --git a/chrome/browser/omnibox_search_hint.cc b/chrome/browser/omnibox_search_hint.cc index 7fe0e60..3ccc28e 100644 --- a/chrome/browser/omnibox_search_hint.cc +++ b/chrome/browser/omnibox_search_hint.cc @@ -22,11 +22,11 @@ #include "chrome/browser/tab_contents/confirm_infobar_delegate.h" #include "chrome/browser/ui/omnibox/location_bar.h" #include "chrome/common/chrome_switches.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 "content/browser/tab_contents/tab_contents.h" +#include "content/common/notification_details.h" +#include "content/common/notification_source.h" +#include "content/common/notification_type.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/omnibox_search_hint.h b/chrome/browser/omnibox_search_hint.h index a0dd25a..2f27ea1 100644 --- a/chrome/browser/omnibox_search_hint.h +++ b/chrome/browser/omnibox_search_hint.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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 <map> #include <string> -#include "chrome/common/notification_observer.h" -#include "chrome/common/notification_registrar.h" +#include "content/common/notification_observer.h" +#include "content/common/notification_registrar.h" class Profile; class TabContents; diff --git a/chrome/browser/password_manager/password_store_default.cc b/chrome/browser/password_manager/password_store_default.cc index f909edd..c029e2c 100644 --- a/chrome/browser/password_manager/password_store_default.cc +++ b/chrome/browser/password_manager/password_store_default.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -13,9 +13,9 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/webdata/web_data_service.h" #include "chrome/common/chrome_constants.h" -#include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "content/browser/browser_thread.h" +#include "content/common/notification_service.h" using webkit_glue::PasswordForm; diff --git a/chrome/browser/password_manager/password_store_mac.cc b/chrome/browser/password_manager/password_store_mac.cc index b5a4b0f..2945032 100644 --- a/chrome/browser/password_manager/password_store_mac.cc +++ b/chrome/browser/password_manager/password_store_mac.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -20,7 +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" +#include "content/common/notification_service.h" using webkit_glue::PasswordForm; diff --git a/chrome/browser/password_manager/password_store_x.cc b/chrome/browser/password_manager/password_store_x.cc index 7de577b..13ab8fb 100644 --- a/chrome/browser/password_manager/password_store_x.cc +++ b/chrome/browser/password_manager/password_store_x.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -10,8 +10,8 @@ #include "base/logging.h" #include "base/stl_util-inl.h" #include "chrome/browser/password_manager/password_store_change.h" -#include "chrome/common/notification_service.h" #include "content/browser/browser_thread.h" +#include "content/common/notification_service.h" using std::vector; using webkit_glue::PasswordForm; diff --git a/chrome/browser/password_manager/password_store_x_unittest.cc b/chrome/browser/password_manager/password_store_x_unittest.cc index 94aadfc..a979685 100644 --- a/chrome/browser/password_manager/password_store_x_unittest.cc +++ b/chrome/browser/password_manager/password_store_x_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -6,17 +6,17 @@ #include "base/scoped_temp_dir.h" #include "base/stl_util-inl.h" #include "base/string_util.h" -#include "base/time.h" #include "base/synchronization/waitable_event.h" +#include "base/time.h" #include "chrome/browser/password_manager/password_form_data.h" #include "chrome/browser/password_manager/password_store_change.h" #include "chrome/browser/password_manager/password_store_x.h" #include "chrome/browser/webdata/web_data_service.h" -#include "chrome/common/notification_observer_mock.h" -#include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "chrome/test/signaling_task.h" #include "chrome/test/testing_profile.h" +#include "content/common/notification_observer_mock.h" +#include "content/common/notification_service.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/plugin_data_remover_helper.cc b/chrome/browser/plugin_data_remover_helper.cc index 7bf3693..2b71913 100644 --- a/chrome/browser/plugin_data_remover_helper.cc +++ b/chrome/browser/plugin_data_remover_helper.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -8,10 +8,10 @@ #include "base/ref_counted.h" #include "chrome/browser/plugin_data_remover.h" -#include "chrome/common/notification_service.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "content/browser/browser_thread.h" +#include "content/common/notification_service.h" // The internal class is refcounted so it can outlive PluginDataRemoverHelper. class PluginDataRemoverHelper::Internal diff --git a/chrome/browser/plugin_data_remover_helper.h b/chrome/browser/plugin_data_remover_helper.h index a1a6537..8e5737b 100644 --- a/chrome/browser/plugin_data_remover_helper.h +++ b/chrome/browser/plugin_data_remover_helper.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -8,8 +8,8 @@ #include "base/ref_counted.h" #include "chrome/browser/prefs/pref_member.h" -#include "chrome/common/notification_observer.h" -#include "chrome/common/notification_registrar.h" +#include "content/common/notification_observer.h" +#include "content/common/notification_registrar.h" class Profile; diff --git a/chrome/browser/plugin_exceptions_table_model.cc b/chrome/browser/plugin_exceptions_table_model.cc index 99169ac..de679f0 100644 --- a/chrome/browser/plugin_exceptions_table_model.cc +++ b/chrome/browser/plugin_exceptions_table_model.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -7,7 +7,7 @@ #include "base/auto_reset.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" -#include "chrome/common/notification_service.h" +#include "content/common/notification_service.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/table_model_observer.h" diff --git a/chrome/browser/plugin_exceptions_table_model.h b/chrome/browser/plugin_exceptions_table_model.h index 620a173..8614258 100644 --- a/chrome/browser/plugin_exceptions_table_model.h +++ b/chrome/browser/plugin_exceptions_table_model.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -13,7 +13,7 @@ #include "base/compiler_specific.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/remove_rows_table_model.h" -#include "chrome/common/notification_observer.h" +#include "content/common/notification_observer.h" #include "webkit/plugins/npapi/plugin_list.h" struct WebPluginInfo; diff --git a/chrome/browser/plugin_updater.cc b/chrome/browser/plugin_updater.cc index 2105d1c..95f31bd 100644 --- a/chrome/browser/plugin_updater.cc +++ b/chrome/browser/plugin_updater.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -15,10 +15,10 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/notification_service.h" #include "chrome/common/pepper_plugin_registry.h" #include "chrome/common/pref_names.h" #include "content/browser/browser_thread.h" +#include "content/common/notification_service.h" #include "webkit/plugins/npapi/plugin_list.h" #include "webkit/plugins/npapi/webplugininfo.h" diff --git a/chrome/browser/plugin_updater.h b/chrome/browser/plugin_updater.h index c5583fa..d94124c 100644 --- a/chrome/browser/plugin_updater.h +++ b/chrome/browser/plugin_updater.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -12,7 +12,7 @@ #include "base/basictypes.h" #include "base/file_path.h" #include "base/singleton.h" -#include "chrome/common/notification_observer.h" +#include "content/common/notification_observer.h" class DictionaryValue; class ListValue; diff --git a/chrome/browser/policy/browser_policy_connector.cc b/chrome/browser/policy/browser_policy_connector.cc index 33c7c3e..382d6d2 100644 --- a/chrome/browser/policy/browser_policy_connector.cc +++ b/chrome/browser/policy/browser_policy_connector.cc @@ -17,8 +17,8 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" +#include "content/common/notification_service.h" #if defined(OS_WIN) #include "chrome/browser/policy/configuration_policy_provider_win.h" diff --git a/chrome/browser/policy/browser_policy_connector.h b/chrome/browser/policy/browser_policy_connector.h index 17e8c14..70eef93 100644 --- a/chrome/browser/policy/browser_policy_connector.h +++ b/chrome/browser/policy/browser_policy_connector.h @@ -8,8 +8,8 @@ #include "base/basictypes.h" #include "base/scoped_ptr.h" -#include "chrome/common/notification_observer.h" -#include "chrome/common/notification_registrar.h" +#include "content/common/notification_observer.h" +#include "content/common/notification_registrar.h" class PrefService; class TestingBrowserProcess; diff --git a/chrome/browser/policy/cloud_policy_subsystem.cc b/chrome/browser/policy/cloud_policy_subsystem.cc index 3b8291a..aad81ad 100644 --- a/chrome/browser/policy/cloud_policy_subsystem.cc +++ b/chrome/browser/policy/cloud_policy_subsystem.cc @@ -15,9 +15,9 @@ #include "chrome/browser/policy/device_management_service.h" #include "chrome/browser/policy/device_token_fetcher.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/notification_details.h" -#include "chrome/common/notification_source.h" -#include "chrome/common/notification_type.h" +#include "content/common/notification_details.h" +#include "content/common/notification_source.h" +#include "content/common/notification_type.h" namespace { diff --git a/chrome/browser/policy/cloud_policy_subsystem.h b/chrome/browser/policy/cloud_policy_subsystem.h index 503e607..9bb8ede 100644 --- a/chrome/browser/policy/cloud_policy_subsystem.h +++ b/chrome/browser/policy/cloud_policy_subsystem.h @@ -8,7 +8,7 @@ #include "base/scoped_ptr.h" #include "chrome/browser/prefs/pref_member.h" -#include "chrome/common/notification_observer.h" +#include "content/common/notification_observer.h" class FilePath; class PrefService; diff --git a/chrome/browser/policy/configuration_policy_pref_store.cc b/chrome/browser/policy/configuration_policy_pref_store.cc index e8b221a..2d365e7 100644 --- a/chrome/browser/policy/configuration_policy_pref_store.cc +++ b/chrome/browser/policy/configuration_policy_pref_store.cc @@ -20,15 +20,15 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/policy/browser_policy_connector.h" #include "chrome/browser/policy/configuration_policy_provider.h" -#include "chrome/browser/policy/profile_policy_connector.h" #include "chrome/browser/policy/policy_path_parser.h" +#include "chrome/browser/policy/profile_policy_connector.h" #include "chrome/browser/prefs/pref_value_map.h" #include "chrome/browser/prefs/proxy_config_dictionary.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/search_terms_data.h" #include "chrome/browser/search_engines/template_url.h" -#include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" +#include "content/common/notification_service.h" #include "policy/policy_constants.h" namespace policy { diff --git a/chrome/browser/policy/configuration_policy_pref_store_unittest.cc b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc index 7495c4f..33613de 100644 --- a/chrome/browser/policy/configuration_policy_pref_store_unittest.cc +++ b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc @@ -7,9 +7,9 @@ #include "chrome/browser/policy/configuration_policy_pref_store.h" #include "chrome/browser/policy/mock_configuration_policy_provider.h" #include "chrome/browser/prefs/proxy_config_dictionary.h" -#include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_store_observer_mock.h" +#include "content/common/notification_service.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/policy/device_policy_identity_strategy.cc b/chrome/browser/policy/device_policy_identity_strategy.cc index 42626a3..82b5303 100644 --- a/chrome/browser/policy/device_policy_identity_strategy.cc +++ b/chrome/browser/policy/device_policy_identity_strategy.cc @@ -13,8 +13,8 @@ #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/guid.h" #include "chrome/common/net/gaia/gaia_constants.h" -#include "chrome/common/notification_service.h" -#include "chrome/common/notification_type.h" +#include "content/common/notification_service.h" +#include "content/common/notification_type.h" namespace policy { diff --git a/chrome/browser/policy/device_policy_identity_strategy.h b/chrome/browser/policy/device_policy_identity_strategy.h index 913a2a3..cf5030a 100644 --- a/chrome/browser/policy/device_policy_identity_strategy.h +++ b/chrome/browser/policy/device_policy_identity_strategy.h @@ -11,8 +11,8 @@ #include "base/ref_counted.h" #include "base/weak_ptr.h" #include "chrome/browser/policy/cloud_policy_identity_strategy.h" -#include "chrome/common/notification_observer.h" -#include "chrome/common/notification_registrar.h" +#include "content/common/notification_observer.h" +#include "content/common/notification_registrar.h" class TokenService; diff --git a/chrome/browser/policy/managed_prefs_banner_base.cc b/chrome/browser/policy/managed_prefs_banner_base.cc index 4862ea9..4e0b5e8 100644 --- a/chrome/browser/policy/managed_prefs_banner_base.cc +++ b/chrome/browser/policy/managed_prefs_banner_base.cc @@ -7,9 +7,9 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/pref_set_observer.h" -#include "chrome/common/notification_details.h" -#include "chrome/common/notification_type.h" #include "chrome/common/pref_names.h" +#include "content/common/notification_details.h" +#include "content/common/notification_type.h" #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/cros_settings_names.h" diff --git a/chrome/browser/policy/managed_prefs_banner_base.h b/chrome/browser/policy/managed_prefs_banner_base.h index 40b798e..181fda6 100644 --- a/chrome/browser/policy/managed_prefs_banner_base.h +++ b/chrome/browser/policy/managed_prefs_banner_base.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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,7 +9,7 @@ #include "base/basictypes.h" #include "base/scoped_ptr.h" #include "chrome/browser/ui/options/options_window.h" -#include "chrome/common/notification_observer.h" +#include "content/common/notification_observer.h" class PrefService; class PrefSetObserver; diff --git a/chrome/browser/policy/user_policy_identity_strategy.cc b/chrome/browser/policy/user_policy_identity_strategy.cc index e900390..d569cd5 100644 --- a/chrome/browser/policy/user_policy_identity_strategy.cc +++ b/chrome/browser/policy/user_policy_identity_strategy.cc @@ -13,10 +13,10 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/guid.h" #include "chrome/common/net/gaia/gaia_constants.h" -#include "chrome/common/notification_details.h" -#include "chrome/common/notification_service.h" -#include "chrome/common/notification_source.h" #include "content/browser/browser_thread.h" +#include "content/common/notification_details.h" +#include "content/common/notification_service.h" +#include "content/common/notification_source.h" #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/login/user_manager.h" diff --git a/chrome/browser/policy/user_policy_identity_strategy.h b/chrome/browser/policy/user_policy_identity_strategy.h index 2ba3e43..6ab07c0 100644 --- a/chrome/browser/policy/user_policy_identity_strategy.h +++ b/chrome/browser/policy/user_policy_identity_strategy.h @@ -12,8 +12,8 @@ #include "base/ref_counted.h" #include "base/weak_ptr.h" #include "chrome/browser/policy/cloud_policy_identity_strategy.h" -#include "chrome/common/notification_observer.h" -#include "chrome/common/notification_registrar.h" +#include "content/common/notification_observer.h" +#include "content/common/notification_registrar.h" class Profile; diff --git a/chrome/browser/prefs/pref_member.cc b/chrome/browser/prefs/pref_member.cc index db17123..66b6609 100644 --- a/chrome/browser/prefs/pref_member.cc +++ b/chrome/browser/prefs/pref_member.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -8,7 +8,7 @@ #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/prefs/pref_service.h" -#include "chrome/common/notification_type.h" +#include "content/common/notification_type.h" namespace subtle { diff --git a/chrome/browser/prefs/pref_member.h b/chrome/browser/prefs/pref_member.h index c82e810..70eeb3a 100644 --- a/chrome/browser/prefs/pref_member.h +++ b/chrome/browser/prefs/pref_member.h @@ -31,8 +31,8 @@ #include "base/file_path.h" #include "base/ref_counted.h" #include "base/values.h" -#include "chrome/common/notification_observer.h" #include "content/browser/browser_thread.h" +#include "content/common/notification_observer.h" class PrefService; diff --git a/chrome/browser/prefs/pref_member_unittest.cc b/chrome/browser/prefs/pref_member_unittest.cc index b47a881..8e0d9889 100644 --- a/chrome/browser/prefs/pref_member_unittest.cc +++ b/chrome/browser/prefs/pref_member_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -6,11 +6,11 @@ #include "base/message_loop.h" #include "chrome/browser/prefs/pref_value_store.h" -#include "chrome/common/notification_details.h" -#include "chrome/common/notification_source.h" -#include "chrome/common/notification_type.h" #include "chrome/test/testing_pref_service.h" #include "content/browser/browser_thread.h" +#include "content/common/notification_details.h" +#include "content/common/notification_source.h" +#include "content/common/notification_type.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome/browser/prefs/pref_notifier_impl.cc b/chrome/browser/prefs/pref_notifier_impl.cc index d15f425..d5ad24c 100644 --- a/chrome/browser/prefs/pref_notifier_impl.cc +++ b/chrome/browser/prefs/pref_notifier_impl.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -6,8 +6,8 @@ #include "base/stl_util-inl.h" #include "chrome/browser/prefs/pref_service.h" -#include "chrome/common/notification_observer.h" -#include "chrome/common/notification_service.h" +#include "content/common/notification_observer.h" +#include "content/common/notification_service.h" PrefNotifierImpl::PrefNotifierImpl(PrefService* service) : pref_service_(service) { |