summaryrefslogtreecommitdiffstats
path: root/chrome/browser/geolocation
diff options
context:
space:
mode:
authorviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-19 17:56:33 +0000
committerviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-19 17:56:33 +0000
commit1f5efc69c8a5513cb8b5dd2acb0fdba591ff6fc1 (patch)
treeb0fdf7d030ffd16c4e5c350a88624bae07db8c25 /chrome/browser/geolocation
parent0d60c7643b6fb555e1c0f60615853a37d6fa1fa8 (diff)
downloadchromium_src-1f5efc69c8a5513cb8b5dd2acb0fdba591ff6fc1.zip
chromium_src-1f5efc69c8a5513cb8b5dd2acb0fdba591ff6fc1.tar.gz
chromium_src-1f5efc69c8a5513cb8b5dd2acb0fdba591ff6fc1.tar.bz2
Clean up unnecessary #includes of base/{scoped_ptr.h,string16.h}.
Also fix a bunch of #includes. Folks, scoped_refptr<> is defined in base/ref_counted.h, not in base/scoped_ptr.h. BUG=none TEST=builds Review URL: http://codereview.chromium.org/3132024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56712 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/geolocation')
-rw-r--r--chrome/browser/geolocation/device_data_provider.h2
-rw-r--r--chrome/browser/geolocation/network_location_provider.h2
-rw-r--r--chrome/browser/geolocation/network_location_request.h1
-rw-r--r--chrome/browser/geolocation/wifi_data_provider_chromeos.h6
-rw-r--r--chrome/browser/geolocation/wifi_data_provider_common.h1
-rw-r--r--chrome/browser/geolocation/win7_location_api_win.h1
6 files changed, 8 insertions, 5 deletions
diff --git a/chrome/browser/geolocation/device_data_provider.h b/chrome/browser/geolocation/device_data_provider.h
index 92649f2..6f7899c 100644
--- a/chrome/browser/geolocation/device_data_provider.h
+++ b/chrome/browser/geolocation/device_data_provider.h
@@ -31,9 +31,9 @@
#include "base/basictypes.h"
#include "base/message_loop.h"
#include "base/non_thread_safe.h"
+#include "base/ref_counted.h"
#include "base/string16.h"
#include "base/string_util.h"
-#include "base/scoped_ptr.h"
#include "base/task.h"
// The following data structures are used to store cell radio data and wifi
diff --git a/chrome/browser/geolocation/network_location_provider.h b/chrome/browser/geolocation/network_location_provider.h
index 2418238..c45d3b4 100644
--- a/chrome/browser/geolocation/network_location_provider.h
+++ b/chrome/browser/geolocation/network_location_provider.h
@@ -9,6 +9,8 @@
#include <string>
#include "base/basictypes.h"
+#include "base/ref_counted.h"
+#include "base/scoped_ptr.h"
#include "base/string16.h"
#include "base/thread.h"
#include "chrome/browser/geolocation/device_data_provider.h"
diff --git a/chrome/browser/geolocation/network_location_request.h b/chrome/browser/geolocation/network_location_request.h
index b94d897..97b09ea 100644
--- a/chrome/browser/geolocation/network_location_request.h
+++ b/chrome/browser/geolocation/network_location_request.h
@@ -9,6 +9,7 @@
#include <string>
#include "base/basictypes.h"
#include "base/ref_counted.h"
+#include "base/scoped_ptr.h"
#include "chrome/browser/geolocation/device_data_provider.h"
#include "chrome/common/net/url_fetcher.h"
#include "googleurl/src/gurl.h"
diff --git a/chrome/browser/geolocation/wifi_data_provider_chromeos.h b/chrome/browser/geolocation/wifi_data_provider_chromeos.h
index 5f27e04..6acef54 100644
--- a/chrome/browser/geolocation/wifi_data_provider_chromeos.h
+++ b/chrome/browser/geolocation/wifi_data_provider_chromeos.h
@@ -8,9 +8,9 @@
#include "chrome/browser/geolocation/wifi_data_provider_common.h"
-#include "base/scoped_ptr.h"
-
-namespace chromeos { class NetworkLibrary; }
+namespace chromeos {
+class NetworkLibrary;
+}
class WifiDataProviderChromeOs : public WifiDataProviderCommon {
public:
diff --git a/chrome/browser/geolocation/wifi_data_provider_common.h b/chrome/browser/geolocation/wifi_data_provider_common.h
index dd36c77..5f0ee0a 100644
--- a/chrome/browser/geolocation/wifi_data_provider_common.h
+++ b/chrome/browser/geolocation/wifi_data_provider_common.h
@@ -9,6 +9,7 @@
#include <assert.h>
#include "base/logging.h"
+#include "base/scoped_ptr.h"
#include "base/string16.h"
#include "base/task.h"
#include "base/thread.h"
diff --git a/chrome/browser/geolocation/win7_location_api_win.h b/chrome/browser/geolocation/win7_location_api_win.h
index 0aa199c..96fcd21 100644
--- a/chrome/browser/geolocation/win7_location_api_win.h
+++ b/chrome/browser/geolocation/win7_location_api_win.h
@@ -11,7 +11,6 @@
#include <sensors.h>
#include <Windows.h>
-#include "base/scoped_ptr.h"
#include "base/time.h"
#include "base/win_util.h"