summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos
diff options
context:
space:
mode:
authorajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-06 22:12:28 +0000
committerajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-06 22:12:28 +0000
commitc694427c13725a8d73303fbe2c47e8cbd6abd6c3 (patch)
treeed40f286e831e116b5718f37e454d8dace85abfb /chrome/browser/chromeos
parent0b8545bf5feeb7e5340eeff11279402c2d06a778 (diff)
downloadchromium_src-c694427c13725a8d73303fbe2c47e8cbd6abd6c3.zip
chromium_src-c694427c13725a8d73303fbe2c47e8cbd6abd6c3.tar.gz
chromium_src-c694427c13725a8d73303fbe2c47e8cbd6abd6c3.tar.bz2
Remove task.h and finish base::Bind() migration.
Over 341 CLs, in ~3 months, touching 3251 unique files! Top 5 most CLs: (121) jhawkins ( 45) dcheng ( 24) achuith ( 23) csilv ( 12) tfarina ( 12) groby ~1000 files touched: (918) jhawkins 100+ files touched: (486) ajwong (385) willchan (372) dcheng (126) csilv (123) fischman (112) sergeyu 49+ files touched: (65) tfarina (57) acolwell (52) adamk (49) tzik BUG=35223 TEST=existing Review URL: http://codereview.chromium.org/9114020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116748 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos')
-rw-r--r--chrome/browser/chromeos/disks/disk_mount_manager.cc15
-rw-r--r--chrome/browser/chromeos/external_metrics.h2
-rw-r--r--chrome/browser/chromeos/login/existing_user_controller.h1
-rw-r--r--chrome/browser/chromeos/login/login_performer.h1
-rw-r--r--chrome/browser/chromeos/login/mock_url_fetchers.h1
-rw-r--r--chrome/browser/chromeos/login/network_screen.h1
-rw-r--r--chrome/browser/chromeos/login/tpm_password_fetcher.h1
-rw-r--r--chrome/browser/chromeos/login/user_manager.cc1
-rw-r--r--chrome/browser/chromeos/net/network_change_notifier_chromeos.h2
-rw-r--r--chrome/browser/chromeos/offline/offline_load_page.h1
-rw-r--r--chrome/browser/chromeos/system/statistics_provider.cc1
11 files changed, 8 insertions, 19 deletions
diff --git a/chrome/browser/chromeos/disks/disk_mount_manager.cc b/chrome/browser/chromeos/disks/disk_mount_manager.cc
index e04abcb..e831ccf 100644
--- a/chrome/browser/chromeos/disks/disk_mount_manager.cc
+++ b/chrome/browser/chromeos/disks/disk_mount_manager.cc
@@ -10,6 +10,7 @@
#include <sys/statvfs.h>
#include "base/bind.h"
+#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
#include "base/string_util.h"
#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
@@ -72,7 +73,7 @@ class DiskMountManagerImpl : public DiskMountManager {
type,
// When succeeds, OnMountCompleted will be called by
// "MountCompleted" signal instead.
- base::Bind(&DoNothing),
+ base::Bind(&base::DoNothing),
base::Bind(&DiskMountManagerImpl::OnMountCompleted,
weak_ptr_factory_.GetWeakPtr(),
MOUNT_ERROR_INTERNAL,
@@ -87,7 +88,7 @@ class DiskMountManagerImpl : public DiskMountManager {
cros_disks_client_->Unmount(mount_path,
base::Bind(&DiskMountManagerImpl::OnUnmountPath,
weak_ptr_factory_.GetWeakPtr()),
- base::Bind(&DoNothing));
+ base::Bind(&base::DoNothing));
}
// DiskMountManager override.
@@ -219,7 +220,7 @@ class DiskMountManagerImpl : public DiskMountManager {
cros_disks_client_->EnumerateAutoMountableDevices(
base::Bind(&DiskMountManagerImpl::OnRequestMountInfo,
weak_ptr_factory_.GetWeakPtr()),
- base::Bind(&DoNothing));
+ base::Bind(&base::DoNothing));
}
// DiskMountManager override.
@@ -395,7 +396,7 @@ class DiskMountManagerImpl : public DiskMountManager {
devices[i],
base::Bind(&DiskMountManagerImpl::OnGetDeviceProperties,
weak_ptr_factory_.GetWeakPtr()),
- base::Bind(&DoNothing));
+ base::Bind(&base::DoNothing));
}
}
// Search and remove disks that are no longer present.
@@ -422,7 +423,7 @@ class DiskMountManagerImpl : public DiskMountManager {
device_path,
base::Bind(&DiskMountManagerImpl::OnGetDeviceProperties,
weak_ptr_factory_.GetWeakPtr()),
- base::Bind(&DoNothing));
+ base::Bind(&base::DoNothing));
return;
}
case DISK_REMOVED: {
@@ -526,10 +527,6 @@ class DiskMountManagerImpl : public DiskMountManager {
return EmptyString();
}
- // A function to be used as an empty callback.
- static void DoNothing() {
- }
-
// Mount event change observers.
ObserverList<Observer> observers_;
diff --git a/chrome/browser/chromeos/external_metrics.h b/chrome/browser/chromeos/external_metrics.h
index 55b0f7a..afbabe3 100644
--- a/chrome/browser/chromeos/external_metrics.h
+++ b/chrome/browser/chromeos/external_metrics.h
@@ -11,7 +11,7 @@
#include "base/file_path.h"
#include "base/gtest_prod_util.h"
#include "base/hash_tables.h"
-#include "base/task.h"
+#include "base/memory/ref_counted.h"
namespace chromeos {
diff --git a/chrome/browser/chromeos/login/existing_user_controller.h b/chrome/browser/chromeos/login/existing_user_controller.h
index b22c057..ec36479 100644
--- a/chrome/browser/chromeos/login/existing_user_controller.h
+++ b/chrome/browser/chromeos/login/existing_user_controller.h
@@ -14,7 +14,6 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/string16.h"
-#include "base/task.h"
#include "base/timer.h"
#include "chrome/browser/chromeos/login/captcha_view.h"
#include "chrome/browser/chromeos/login/login_display.h"
diff --git a/chrome/browser/chromeos/login/login_performer.h b/chrome/browser/chromeos/login/login_performer.h
index e45136a..08343cc 100644
--- a/chrome/browser/chromeos/login/login_performer.h
+++ b/chrome/browser/chromeos/login/login_performer.h
@@ -10,7 +10,6 @@
#include "base/basictypes.h"
#include "base/memory/weak_ptr.h"
-#include "base/task.h"
#include "chrome/browser/chromeos/login/authenticator.h"
#include "chrome/browser/chromeos/login/login_status_consumer.h"
#include "chrome/browser/profiles/profile_manager.h"
diff --git a/chrome/browser/chromeos/login/mock_url_fetchers.h b/chrome/browser/chromeos/login/mock_url_fetchers.h
index 44254dc..02a33a0 100644
--- a/chrome/browser/chromeos/login/mock_url_fetchers.h
+++ b/chrome/browser/chromeos/login/mock_url_fetchers.h
@@ -11,7 +11,6 @@
#include "base/memory/weak_ptr.h"
#include "base/compiler_specific.h"
#include "base/message_loop.h"
-#include "base/task.h"
#include "content/test/test_url_fetcher_factory.h"
#include "googleurl/src/gurl.h"
#include "net/url_request/url_request_status.h"
diff --git a/chrome/browser/chromeos/login/network_screen.h b/chrome/browser/chromeos/login/network_screen.h
index 04c6ab6..483bdc1 100644
--- a/chrome/browser/chromeos/login/network_screen.h
+++ b/chrome/browser/chromeos/login/network_screen.h
@@ -9,7 +9,6 @@
#include "base/compiler_specific.h"
#include "base/memory/ref_counted.h"
#include "base/string16.h"
-#include "base/task.h"
#include "base/timer.h"
#include "chrome/browser/chromeos/cros/network_library.h"
#include "chrome/browser/chromeos/login/language_switch_menu.h"
diff --git a/chrome/browser/chromeos/login/tpm_password_fetcher.h b/chrome/browser/chromeos/login/tpm_password_fetcher.h
index b30783d..326e942 100644
--- a/chrome/browser/chromeos/login/tpm_password_fetcher.h
+++ b/chrome/browser/chromeos/login/tpm_password_fetcher.h
@@ -9,7 +9,6 @@
#include "base/basictypes.h"
#include "base/memory/weak_ptr.h"
-#include "base/task.h"
namespace chromeos {
diff --git a/chrome/browser/chromeos/login/user_manager.cc b/chrome/browser/chromeos/login/user_manager.cc
index f56f299..be6fc80 100644
--- a/chrome/browser/chromeos/login/user_manager.cc
+++ b/chrome/browser/chromeos/login/user_manager.cc
@@ -19,7 +19,6 @@
#include "base/rand_util.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
-#include "base/task.h"
#include "base/time.h"
#include "base/utf_string_conversions.h"
#include "base/values.h"
diff --git a/chrome/browser/chromeos/net/network_change_notifier_chromeos.h b/chrome/browser/chromeos/net/network_change_notifier_chromeos.h
index f41dd61..a2bf168 100644
--- a/chrome/browser/chromeos/net/network_change_notifier_chromeos.h
+++ b/chrome/browser/chromeos/net/network_change_notifier_chromeos.h
@@ -8,7 +8,7 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
-#include "base/task.h"
+#include "base/memory/weak_ptr.h"
#include "chrome/browser/chromeos/cros/network_library.h"
#include "chrome/browser/chromeos/dbus/power_manager_client.h"
#include "net/base/network_change_notifier.h"
diff --git a/chrome/browser/chromeos/offline/offline_load_page.h b/chrome/browser/chromeos/offline/offline_load_page.h
index 5288291..e403949 100644
--- a/chrome/browser/chromeos/offline/offline_load_page.h
+++ b/chrome/browser/chromeos/offline/offline_load_page.h
@@ -9,7 +9,6 @@
#include <string>
#include "base/compiler_specific.h"
-#include "base/task.h"
#include "chrome/browser/tab_contents/chrome_interstitial_page.h"
#include "net/base/network_change_notifier.h"
diff --git a/chrome/browser/chromeos/system/statistics_provider.cc b/chrome/browser/chromeos/system/statistics_provider.cc
index 17e4bd2..32ef5ca 100644
--- a/chrome/browser/chromeos/system/statistics_provider.cc
+++ b/chrome/browser/chromeos/system/statistics_provider.cc
@@ -10,7 +10,6 @@
#include "base/logging.h"
#include "base/memory/singleton.h"
#include "base/synchronization/waitable_event.h"
-#include "base/task.h"
#include "base/time.h"
#include "chrome/browser/chromeos/system/name_value_pairs_parser.h"
#include "chrome/browser/chromeos/system/runtime_environment.h"