diff options
21 files changed, 42 insertions, 21 deletions
diff --git a/base/callback_forward.h b/base/callback_forward.h new file mode 100644 index 0000000..0f62864 --- /dev/null +++ b/base/callback_forward.h @@ -0,0 +1,18 @@ +// 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. + +#ifndef BASE_CALLBACK_FORWARD_H_ +#define BASE_CALLBACK_FORWARD_H_ +#pragma once + +namespace base { + +template <typename Sig> +class Callback; + +typedef Callback<void(void)> Closure; + +} // namespace base + +#endif // BASE_CALLBACK_FORWARD_H diff --git a/base/message_loop.h b/base/message_loop.h index ffa5aae..1098703 100644 --- a/base/message_loop.h +++ b/base/message_loop.h @@ -11,7 +11,7 @@ #include "base/base_export.h" #include "base/basictypes.h" -#include "base/callback.h" +#include "base/callback_forward.h" #include "base/location.h" #include "base/memory/ref_counted.h" #include "base/message_loop_proxy.h" diff --git a/base/message_loop_proxy.h b/base/message_loop_proxy.h index d783b4e..aac11b9 100644 --- a/base/message_loop_proxy.h +++ b/base/message_loop_proxy.h @@ -8,7 +8,7 @@ #include "base/base_export.h" #include "base/basictypes.h" -#include "base/callback.h" +#include "base/callback_forward.h" #include "base/memory/ref_counted.h" #include "base/task.h" diff --git a/base/threading/worker_pool.h b/base/threading/worker_pool.h index 7eabe8f..0db6122 100644 --- a/base/threading/worker_pool.h +++ b/base/threading/worker_pool.h @@ -7,7 +7,7 @@ #pragma once #include "base/base_export.h" -#include "base/callback.h" +#include "base/callback_forward.h" class Task; diff --git a/base/threading/worker_pool_posix.h b/base/threading/worker_pool_posix.h index 1b5032b..491dbbb 100644 --- a/base/threading/worker_pool_posix.h +++ b/base/threading/worker_pool_posix.h @@ -29,7 +29,7 @@ #include <string> #include "base/basictypes.h" -#include "base/callback.h" +#include "base/callback_forward.h" #include "base/location.h" #include "base/time.h" #include "base/memory/ref_counted.h" diff --git a/chrome/browser/automation/ui_controls.h b/chrome/browser/automation/ui_controls.h index 210dfec..19e215a 100644 --- a/chrome/browser/automation/ui_controls.h +++ b/chrome/browser/automation/ui_controls.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 <wtypes.h> #endif -#include "base/callback.h" +#include "base/callback_forward.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/point.h" diff --git a/chrome/browser/automation/ui_controls_internal.cc b/chrome/browser/automation/ui_controls_internal.cc index 1263230..9765b1b 100644 --- a/chrome/browser/automation/ui_controls_internal.cc +++ b/chrome/browser/automation/ui_controls_internal.cc @@ -4,6 +4,8 @@ #include "chrome/browser/automation/ui_controls_internal.h" +#include "base/callback.h" + namespace ui_controls { namespace internal { diff --git a/chrome/browser/automation/ui_controls_internal.h b/chrome/browser/automation/ui_controls_internal.h index d28f361..cf87d49 100644 --- a/chrome/browser/automation/ui_controls_internal.h +++ b/chrome/browser/automation/ui_controls_internal.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_AUTOMATION_UI_CONTROLS_INTERNAL_H_ #define CHROME_BROWSER_AUTOMATION_UI_CONTROLS_INTERNAL_H_ -#include "base/callback.h" +#include "base/callback_forward.h" #include "chrome/browser/automation/ui_controls.h" namespace ui_controls { diff --git a/chrome/browser/automation/ui_controls_win.cc b/chrome/browser/automation/ui_controls_win.cc index 6db0e4a..62b98609 100644 --- a/chrome/browser/automation/ui_controls_win.cc +++ b/chrome/browser/automation/ui_controls_win.cc @@ -4,6 +4,7 @@ #include "chrome/browser/automation/ui_controls.h" +#include "base/callback.h" #include "chrome/browser/automation/ui_controls_internal.h" #include "ui/gfx/point.h" #include "views/view.h" diff --git a/chrome/browser/favicon/favicon_handler.h b/chrome/browser/favicon/favicon_handler.h index da979f9..6c34cc0 100644 --- a/chrome/browser/favicon/favicon_handler.h +++ b/chrome/browser/favicon/favicon_handler.h @@ -9,7 +9,7 @@ #include <map> #include "base/basictypes.h" -#include "base/callback.h" +#include "base/callback_forward.h" #include "base/memory/ref_counted.h" #include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/favicon/favicon_tab_helper.h" diff --git a/chrome/browser/importer/toolbar_importer_utils.h b/chrome/browser/importer/toolbar_importer_utils.h index ed04715..27ca6ac 100644 --- a/chrome/browser/importer/toolbar_importer_utils.h +++ b/chrome/browser/importer/toolbar_importer_utils.h @@ -6,8 +6,7 @@ #define CHROME_BROWSER_IMPORTER_TOOLBAR_IMPORTER_UTILS_H_ #pragma once -#include "base/bind.h" -#include "base/callback.h" +#include "base/callback_forward.h" class Profile; diff --git a/chrome/browser/intents/web_intents_registry.h b/chrome/browser/intents/web_intents_registry.h index 5a9e5f0..7f0e874 100644 --- a/chrome/browser/intents/web_intents_registry.h +++ b/chrome/browser/intents/web_intents_registry.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_INTENTS_WEB_INTENTS_REGISTRY_H_ #pragma once -#include "base/callback.h" +#include "base/callback_forward.h" #include "base/hash_tables.h" #include "base/memory/ref_counted.h" #include "chrome/browser/extensions/extension_service.h" diff --git a/chrome/browser/mock_browsing_data_appcache_helper.h b/chrome/browser/mock_browsing_data_appcache_helper.h index 0936262..15b0b4d 100644 --- a/chrome/browser/mock_browsing_data_appcache_helper.h +++ b/chrome/browser/mock_browsing_data_appcache_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. @@ -6,7 +6,7 @@ #define CHROME_BROWSER_MOCK_BROWSING_DATA_APPCACHE_HELPER_H_ #pragma once -#include "base/callback.h" +#include "base/callback_forward.h" #include "chrome/browser/browsing_data_appcache_helper.h" class MockBrowsingDataAppCacheHelper diff --git a/chrome/browser/password_manager/password_store_mac.h b/chrome/browser/password_manager/password_store_mac.h index cfd7297..3a509ef 100644 --- a/chrome/browser/password_manager/password_store_mac.h +++ b/chrome/browser/password_manager/password_store_mac.h @@ -8,7 +8,7 @@ #include <vector> -#include "base/callback.h" +#include "base/callback_forward.h" #include "base/memory/scoped_ptr.h" #include "base/threading/thread.h" #include "chrome/browser/password_manager/login_database.h" diff --git a/chrome/browser/prerender/prerender_tracker.h b/chrome/browser/prerender/prerender_tracker.h index 9a53004..5a3e138 100644 --- a/chrome/browser/prerender/prerender_tracker.h +++ b/chrome/browser/prerender/prerender_tracker.h @@ -10,7 +10,7 @@ #include <set> #include <vector> -#include "base/callback.h" +#include "base/callback_forward.h" #include "base/gtest_prod_util.h" #include "base/synchronization/lock.h" #include "base/threading/non_thread_safe.h" diff --git a/chrome/browser/profiles/profile_io_data.h b/chrome/browser/profiles/profile_io_data.h index 7d16707..5bd4088 100644 --- a/chrome/browser/profiles/profile_io_data.h +++ b/chrome/browser/profiles/profile_io_data.h @@ -9,7 +9,7 @@ #include <string> #include "base/basictypes.h" -#include "base/callback.h" +#include "base/callback_forward.h" #include "base/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/profiles/profile_shortcut_manager_win.h b/chrome/browser/profiles/profile_shortcut_manager_win.h index 938bcbe..94de482 100644 --- a/chrome/browser/profiles/profile_shortcut_manager_win.h +++ b/chrome/browser/profiles/profile_shortcut_manager_win.h @@ -8,7 +8,7 @@ #include <vector> -#include "base/callback.h" +#include "base/callback_forward.h" #include "base/compiler_specific.h" #include "base/string16.h" #include "chrome/browser/profiles/profile_info_cache_observer.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_store.h b/chrome/browser/safe_browsing/safe_browsing_store.h index f7aed5e..a5b67fb 100644 --- a/chrome/browser/safe_browsing/safe_browsing_store.h +++ b/chrome/browser/safe_browsing/safe_browsing_store.h @@ -10,7 +10,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/callback.h" +#include "base/callback_forward.h" #include "base/hash_tables.h" #include "base/time.h" #include "chrome/browser/safe_browsing/safe_browsing_util.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_store_file.h b/chrome/browser/safe_browsing/safe_browsing_store_file.h index 2731688..d4e4403 100644 --- a/chrome/browser/safe_browsing/safe_browsing_store_file.h +++ b/chrome/browser/safe_browsing/safe_browsing_store_file.h @@ -11,6 +11,7 @@ #include "chrome/browser/safe_browsing/safe_browsing_store.h" +#include "base/callback.h" #include "base/file_util.h" // Implement SafeBrowsingStore in terms of a flat file. The file diff --git a/chrome/browser/spellchecker/spellchecker_platform_engine.h b/chrome/browser/spellchecker/spellchecker_platform_engine.h index e4f054a..769c669 100644 --- a/chrome/browser/spellchecker/spellchecker_platform_engine.h +++ b/chrome/browser/spellchecker/spellchecker_platform_engine.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. @@ -12,7 +12,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/callback_forward.h" #include "base/string16.h" class BrowserMessageFilter; diff --git a/chrome/browser/webdata/web_data_service.h b/chrome/browser/webdata/web_data_service.h index 42e9718..5571326 100644 --- a/chrome/browser/webdata/web_data_service.h +++ b/chrome/browser/webdata/web_data_service.h @@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/callback_forward.h" #include "base/file_path.h" #include "base/memory/ref_counted.h" #include "base/synchronization/lock.h" |