summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-12 23:08:24 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-12 23:08:24 +0000
commita932ea9e0dd159ee9b57a334f3c0fde55fcce98f (patch)
treef434ebe9095d4c51fb92f907ff301cf432244088
parent2ea3424d69a9dafc61b90448cce2b462c394047b (diff)
downloadchromium_src-a932ea9e0dd159ee9b57a334f3c0fde55fcce98f.zip
chromium_src-a932ea9e0dd159ee9b57a334f3c0fde55fcce98f.tar.gz
chromium_src-a932ea9e0dd159ee9b57a334f3c0fde55fcce98f.tar.bz2
Move IDMap from base/ to common/
Nothing in base/ uses it, and I'm going to make some non-trivial changes to it. TEST=none http://crbug.com/19202 Review URL: http://codereview.chromium.org/164428 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23243 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--base/base.gyp1
-rw-r--r--chrome/browser/chrome_plugin_browsing_context.h2
-rw-r--r--chrome/browser/renderer_host/render_process_host.h2
-rw-r--r--chrome/chrome.gyp1
-rw-r--r--chrome/common/app_cache/app_cache_context_impl.h2
-rw-r--r--chrome/common/app_cache/app_cache_dispatcher_host.h2
-rw-r--r--chrome/common/db_message_filter.cc2
-rw-r--r--chrome/common/db_message_filter.h2
-rw-r--r--chrome/common/id_map.h (renamed from base/id_map.h)6
-rw-r--r--chrome/common/message_router.h2
-rw-r--r--chrome/renderer/audio_message_filter.h2
-rw-r--r--chrome/renderer/render_view.h2
12 files changed, 13 insertions, 13 deletions
diff --git a/base/base.gyp b/base/base.gyp
index d0e3c4f..6603ce6 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -147,7 +147,6 @@
'iat_patch.h',
'icu_util.cc',
'icu_util.h',
- 'id_map.h',
'idle_timer.cc',
'idle_timer.h',
'idle_timer_none.cc',
diff --git a/chrome/browser/chrome_plugin_browsing_context.h b/chrome/browser/chrome_plugin_browsing_context.h
index 16499e8..d79f5d2 100644
--- a/chrome/browser/chrome_plugin_browsing_context.h
+++ b/chrome/browser/chrome_plugin_browsing_context.h
@@ -7,8 +7,8 @@
#include <map>
-#include "base/id_map.h"
#include "chrome/common/chrome_plugin_api.h"
+#include "chrome/common/id_map.h"
#include "chrome/common/notification_registrar.h"
class URLRequestContext;
diff --git a/chrome/browser/renderer_host/render_process_host.h b/chrome/browser/renderer_host/render_process_host.h
index 1653fcb..aee189c 100644
--- a/chrome/browser/renderer_host/render_process_host.h
+++ b/chrome/browser/renderer_host/render_process_host.h
@@ -8,9 +8,9 @@
#include <set>
#include <string>
-#include "base/id_map.h"
#include "base/process.h"
#include "base/scoped_ptr.h"
+#include "chrome/common/id_map.h"
#include "chrome/common/transport_dib.h"
#include "chrome/common/visitedlink_common.h"
#include "ipc/ipc_sync_channel.h"
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 053792a..96057df 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -358,6 +358,7 @@
'common/extensions/user_script.cc',
'common/extensions/user_script.h',
'common/gfx/utils.h',
+ 'common/id_map.h',
'common/net/cookie_monster_sqlite.cc',
'common/net/cookie_monster_sqlite.h',
'common/net/dns.h',
diff --git a/chrome/common/app_cache/app_cache_context_impl.h b/chrome/common/app_cache/app_cache_context_impl.h
index ec2f25f..b9ed757 100644
--- a/chrome/common/app_cache/app_cache_context_impl.h
+++ b/chrome/common/app_cache/app_cache_context_impl.h
@@ -5,7 +5,7 @@
#ifndef CHROME_COMMON_APP_CACHE_APP_CACHE_CONTEXT_IMPL_H_
#define CHROME_COMMON_APP_CACHE_APP_CACHE_CONTEXT_IMPL_H_
-#include "base/id_map.h"
+#include "chrome/common/id_map.h"
#include "ipc/ipc_message.h"
#include "webkit/glue/webappcachecontext.h"
diff --git a/chrome/common/app_cache/app_cache_dispatcher_host.h b/chrome/common/app_cache/app_cache_dispatcher_host.h
index 749e74a..6de17a3 100644
--- a/chrome/common/app_cache/app_cache_dispatcher_host.h
+++ b/chrome/common/app_cache/app_cache_dispatcher_host.h
@@ -5,7 +5,7 @@
#ifndef CHROME_COMMON_APP_CACHE_APP_CACHE_DISPATCHER_HOST_H_
#define CHROME_COMMON_APP_CACHE_APP_CACHE_DISPATCHER_HOST_H_
-#include "base/id_map.h"
+#include "chrome/common/id_map.h"
#include "ipc/ipc_message.h"
#include "webkit/glue/webappcachecontext.h"
diff --git a/chrome/common/db_message_filter.cc b/chrome/common/db_message_filter.cc
index cba4aea..992ffad 100644
--- a/chrome/common/db_message_filter.cc
+++ b/chrome/common/db_message_filter.cc
@@ -5,12 +5,12 @@
#include "db_message_filter.h"
#include "base/atomic_sequence_num.h"
-#include "base/id_map.h"
#include "base/lock.h"
#include "base/message_loop.h"
#include "base/platform_file.h"
#include "base/task.h"
#include "chrome/common/child_process.h"
+#include "chrome/common/id_map.h"
#include "chrome/common/render_messages.h"
#include "ipc/ipc_channel.h"
#include "ipc/ipc_message.h"
diff --git a/chrome/common/db_message_filter.h b/chrome/common/db_message_filter.h
index 1376db0..4728400 100644
--- a/chrome/common/db_message_filter.h
+++ b/chrome/common/db_message_filter.h
@@ -5,9 +5,9 @@
#ifndef CHROME_COMMON_DB_MESSAGE_FILTER_H_
#define CHROME_COMMON_DB_MESSAGE_FILTER_H_
-#include "base/id_map.h"
#include "base/scoped_ptr.h"
#include "base/waitable_event.h"
+#include "chrome/common/id_map.h"
#include "ipc/ipc_channel_proxy.h"
class Lock;
diff --git a/base/id_map.h b/chrome/common/id_map.h
index 9f6111e..5d8d40a 100644
--- a/base/id_map.h
+++ b/chrome/common/id_map.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef BASE_ID_MAP_H__
-#define BASE_ID_MAP_H__
+#ifndef CHROME_COMMON_ID_MAP_H_
+#define CHROME_COMMON_ID_MAP_H_
#include "base/basictypes.h"
#include "base/hash_tables.h"
@@ -101,4 +101,4 @@ class IDMap {
bool check_on_null_data_;
};
-#endif // BASE_ID_MAP_H__
+#endif // CHROME_COMMON_ID_MAP_H_
diff --git a/chrome/common/message_router.h b/chrome/common/message_router.h
index ef18aaa..ef648ab 100644
--- a/chrome/common/message_router.h
+++ b/chrome/common/message_router.h
@@ -5,7 +5,7 @@
#ifndef CHROME_COMMON_MESSAGE_ROUTER_H__
#define CHROME_COMMON_MESSAGE_ROUTER_H__
-#include "base/id_map.h"
+#include "chrome/common/id_map.h"
#include "ipc/ipc_channel.h"
// The MessageRouter handles all incoming messages sent to it by routing them
diff --git a/chrome/renderer/audio_message_filter.h b/chrome/renderer/audio_message_filter.h
index f714e1b..ef3ecac 100644
--- a/chrome/renderer/audio_message_filter.h
+++ b/chrome/renderer/audio_message_filter.h
@@ -10,8 +10,8 @@
#ifndef CHROME_RENDERER_AUDIO_MESSAGE_FILTER_H_
#define CHROME_RENDERER_AUDIO_MESSAGE_FILTER_H_
-#include "base/id_map.h"
#include "base/shared_memory.h"
+#include "chrome/common/id_map.h"
#include "chrome/common/render_messages.h"
#include "ipc/ipc_channel_proxy.h"
#include "testing/gtest/include/gtest/gtest_prod.h"
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index 3fe509b..ef29a81 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -13,11 +13,11 @@
#include "base/file_path.h"
#include "base/gfx/point.h"
#include "base/gfx/rect.h"
-#include "base/id_map.h"
#include "base/shared_memory.h"
#include "base/timer.h"
#include "base/values.h"
#include "build/build_config.h"
+#include "chrome/common/id_map.h"
#include "chrome/common/renderer_preferences.h"
#include "chrome/renderer/automation/dom_automation_controller.h"
#include "chrome/renderer/dom_ui_bindings.h"