summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--base/callback.h1
-rw-r--r--base/callback.h.pump1
-rw-r--r--chrome/browser/chromeos/audio_mixer.h2
-rw-r--r--chrome/browser/chromeos/audio_mixer_alsa.h2
-rw-r--r--chrome/browser/chromeos/boot_times_loader.h2
-rw-r--r--chrome/browser/chromeos/cros/syslogs_library.h1
-rw-r--r--chrome/browser/chromeos/login/ownership_status_checker.h2
-rw-r--r--chrome/browser/chromeos/version_loader.h4
-rw-r--r--chrome_frame/urlmon_url_request.cc1
-rw-r--r--chrome_frame/urlmon_url_request_private.h2
-rw-r--r--content/plugin/webplugin_accelerated_surface_proxy_mac.cc1
-rw-r--r--remoting/base/compound_buffer_unittest.cc2
-rw-r--r--ui/gfx/surface/accelerated_surface_mac.h2
-rw-r--r--views/repeat_controller.h2
14 files changed, 13 insertions, 12 deletions
diff --git a/base/callback.h b/base/callback.h
index dafbc0c..983fa7b02 100644
--- a/base/callback.h
+++ b/base/callback.h
@@ -13,7 +13,6 @@
#pragma once
#include "base/callback_internal.h"
-#include "base/callback_old.h"
// New, super-duper, unified Callback system. This will eventually replace
// NewRunnableMethod, NewRunnableFunction, CreateFunctor, and CreateCallback
diff --git a/base/callback.h.pump b/base/callback.h.pump
index 542a84f..b565e38 100644
--- a/base/callback.h.pump
+++ b/base/callback.h.pump
@@ -16,7 +16,6 @@ $var MAX_ARITY = 6
#pragma once
#include "base/callback_internal.h"
-#include "base/callback_old.h"
// New, super-duper, unified Callback system. This will eventually replace
// NewRunnableMethod, NewRunnableFunction, CreateFunctor, and CreateCallback
diff --git a/chrome/browser/chromeos/audio_mixer.h b/chrome/browser/chromeos/audio_mixer.h
index a1b91b6..f936c7c 100644
--- a/chrome/browser/chromeos/audio_mixer.h
+++ b/chrome/browser/chromeos/audio_mixer.h
@@ -7,7 +7,7 @@
#pragma once
#include "base/basictypes.h"
-#include "base/callback.h"
+#include "base/callback_old.h"
namespace chromeos {
diff --git a/chrome/browser/chromeos/audio_mixer_alsa.h b/chrome/browser/chromeos/audio_mixer_alsa.h
index c3c9332..4fc6274 100644
--- a/chrome/browser/chromeos/audio_mixer_alsa.h
+++ b/chrome/browser/chromeos/audio_mixer_alsa.h
@@ -7,7 +7,7 @@
#pragma once
#include "base/basictypes.h"
-#include "base/callback.h"
+#include "base/callback_old.h"
#include "base/memory/scoped_ptr.h"
#include "base/synchronization/lock.h"
#include "base/synchronization/waitable_event.h"
diff --git a/chrome/browser/chromeos/boot_times_loader.h b/chrome/browser/chromeos/boot_times_loader.h
index a8cec33..b5d4856 100644
--- a/chrome/browser/chromeos/boot_times_loader.h
+++ b/chrome/browser/chromeos/boot_times_loader.h
@@ -9,7 +9,7 @@
#include <string>
#include "base/atomic_sequence_num.h"
-#include "base/callback.h"
+#include "base/callback_old.h"
#include "base/time.h"
#include "content/browser/cancelable_request.h"
#include "content/common/notification_observer.h"
diff --git a/chrome/browser/chromeos/cros/syslogs_library.h b/chrome/browser/chromeos/cros/syslogs_library.h
index f78fa1d..d95f24d 100644
--- a/chrome/browser/chromeos/cros/syslogs_library.h
+++ b/chrome/browser/chromeos/cros/syslogs_library.h
@@ -6,6 +6,7 @@
#define CHROME_BROWSER_CHROMEOS_CROS_SYSLOGS_LIBRARY_H_
#pragma once
+#include "base/callback_old.h"
#include "base/memory/singleton.h"
#include "content/browser/cancelable_request.h"
#include "third_party/cros/chromeos_syslogs.h"
diff --git a/chrome/browser/chromeos/login/ownership_status_checker.h b/chrome/browser/chromeos/login/ownership_status_checker.h
index fff75df..9da8ed8 100644
--- a/chrome/browser/chromeos/login/ownership_status_checker.h
+++ b/chrome/browser/chromeos/login/ownership_status_checker.h
@@ -7,7 +7,7 @@
#pragma once
#include "base/basictypes.h"
-#include "base/callback.h"
+#include "base/callback_old.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop_proxy.h"
diff --git a/chrome/browser/chromeos/version_loader.h b/chrome/browser/chromeos/version_loader.h
index e3ea990..b64d975 100644
--- a/chrome/browser/chromeos/version_loader.h
+++ b/chrome/browser/chromeos/version_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.
@@ -8,7 +8,7 @@
#include <string>
-#include "base/callback.h"
+#include "base/callback_old.h"
#include "base/gtest_prod_util.h"
#include "content/browser/cancelable_request.h"
diff --git a/chrome_frame/urlmon_url_request.cc b/chrome_frame/urlmon_url_request.cc
index e590b5d..a53a047 100644
--- a/chrome_frame/urlmon_url_request.cc
+++ b/chrome_frame/urlmon_url_request.cc
@@ -7,6 +7,7 @@
#include <urlmon.h>
#include <wininet.h>
+#include "base/callback_old.h"
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
diff --git a/chrome_frame/urlmon_url_request_private.h b/chrome_frame/urlmon_url_request_private.h
index 498fb5d..adf818d 100644
--- a/chrome_frame/urlmon_url_request_private.h
+++ b/chrome_frame/urlmon_url_request_private.h
@@ -9,7 +9,7 @@
#include <atlcom.h>
#include <string>
-#include "base/callback.h"
+#include "base/callback_old.h"
#include "base/threading/platform_thread.h"
#include "net/base/net_errors.h"
#include "net/http/http_response_headers.h"
diff --git a/content/plugin/webplugin_accelerated_surface_proxy_mac.cc b/content/plugin/webplugin_accelerated_surface_proxy_mac.cc
index 58f27fd..77f76c5 100644
--- a/content/plugin/webplugin_accelerated_surface_proxy_mac.cc
+++ b/content/plugin/webplugin_accelerated_surface_proxy_mac.cc
@@ -6,6 +6,7 @@
#include "content/plugin/webplugin_accelerated_surface_proxy_mac.h"
+#include "base/callback_old.h"
#include "content/plugin/webplugin_proxy.h"
#include "ui/gfx/surface/accelerated_surface_mac.h"
#include "ui/gfx/surface/transport_dib.h"
diff --git a/remoting/base/compound_buffer_unittest.cc b/remoting/base/compound_buffer_unittest.cc
index 4889c0c..60b9b78 100644
--- a/remoting/base/compound_buffer_unittest.cc
+++ b/remoting/base/compound_buffer_unittest.cc
@@ -4,7 +4,7 @@
#include <string>
-#include "base/callback.h"
+#include "base/callback_old.h"
#include "base/memory/scoped_ptr.h"
#include "net/base/io_buffer.h"
#include "remoting/base/compound_buffer.h"
diff --git a/ui/gfx/surface/accelerated_surface_mac.h b/ui/gfx/surface/accelerated_surface_mac.h
index 8491091..0c780ab 100644
--- a/ui/gfx/surface/accelerated_surface_mac.h
+++ b/ui/gfx/surface/accelerated_surface_mac.h
@@ -8,7 +8,7 @@
#include <CoreFoundation/CoreFoundation.h>
-#include "base/callback.h"
+#include "base/callback_old.h"
#include "base/mac/scoped_cftyperef.h"
#include "base/memory/scoped_ptr.h"
#include "ui/gfx/rect.h"
diff --git a/views/repeat_controller.h b/views/repeat_controller.h
index e50f36f..31ab1c7 100644
--- a/views/repeat_controller.h
+++ b/views/repeat_controller.h
@@ -6,7 +6,7 @@
#define VIEWS_REPEAT_CONTROLLER_H_
#pragma once
-#include "base/callback.h"
+#include "base/callback_old.h"
#include "base/memory/scoped_ptr.h"
#include "base/timer.h"
generated by cgit v1.1 at 2025-02-09 06:39:09 +0000