summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-29 21:54:42 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-29 21:54:42 +0000
commitd546c48d90f0eaa592794f59e6a970b7b027db86 (patch)
tree44914e9ea575a25c544b0ec9bc0925e7c2f3f0ea
parenteb86ce771f109d0cd3b20d68027f4f3628da03e6 (diff)
downloadchromium_src-d546c48d90f0eaa592794f59e6a970b7b027db86.zip
chromium_src-d546c48d90f0eaa592794f59e6a970b7b027db86.tar.gz
chromium_src-d546c48d90f0eaa592794f59e6a970b7b027db86.tar.bz2
Move rgs_helper out of base to ceee since it's not used anywhere else.
TEST=it compiles BUG=none Review URL: http://codereview.chromium.org/6041007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70280 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--base/base.gypi1
-rw-r--r--ceee/ie/broker/broker.h2
-rw-r--r--ceee/ie/common/rgs_helper.h (renamed from base/win/rgs_helper.h)6
-rw-r--r--ceee/ie/ie.gyp1
-rw-r--r--ceee/ie/plugin/bho/browser_helper_object.h2
-rw-r--r--ceee/ie/plugin/bho/executor.h2
-rw-r--r--ceee/ie/plugin/toolband/tool_band.h2
7 files changed, 8 insertions, 8 deletions
diff --git a/base/base.gypi b/base/base.gypi
index b7bbcc4..102c49ca 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -304,7 +304,6 @@
'win/pe_image.h',
'win/registry.cc',
'win/registry.h',
- 'win/rgs_helper.h',
'win/scoped_bstr.cc',
'win/scoped_bstr.h',
'win/scoped_comptr.h',
diff --git a/ceee/ie/broker/broker.h b/ceee/ie/broker/broker.h
index 617fc8f..f8a07d1 100644
--- a/ceee/ie/broker/broker.h
+++ b/ceee/ie/broker/broker.h
@@ -11,8 +11,8 @@
#include <atlbase.h>
#include <atlcom.h>
-#include "base/win/rgs_helper.h"
#include "ceee/ie/broker/resource.h"
+#include "ceee/ie/common/rgs_helper.h"
#include "broker_lib.h" // NOLINT
diff --git a/base/win/rgs_helper.h b/ceee/ie/common/rgs_helper.h
index 16e33bf..1f1d235 100644
--- a/base/win/rgs_helper.h
+++ b/ceee/ie/common/rgs_helper.h
@@ -16,8 +16,8 @@
//
// You can then refer to the names above in your RGS file as
// variables %NAME% and %CLSID%, respectively.
-#ifndef BASE_WIN_RGS_HELPER_H_
-#define BASE_WIN_RGS_HELPER_H_
+#ifndef CEEE_IE_COMMON_RGS_HELPER_H_
+#define CEEE_IE_COMMON_RGS_HELPER_H_
#include "base/string_util.h"
@@ -86,4 +86,4 @@ struct ATLRegmapEntryHelper : public _ATL_REGMAP_ENTRY {
_GetRegistryMap());\
}
-#endif // BASE_WIN_RGS_HELPER_H_
+#endif // CEEE_IE_COMMON_RGS_HELPER_H_
diff --git a/ceee/ie/ie.gyp b/ceee/ie/ie.gyp
index 2ee286c..ef6bed3 100644
--- a/ceee/ie/ie.gyp
+++ b/ceee/ie/ie.gyp
@@ -54,6 +54,7 @@
'common/extension_manifest_unittest.cc',
'common/ie_util_unittest.cc',
'common/metrics_util_unittest.cc',
+ 'common/rgs_helper.h',
'plugin/bho/browser_helper_object_unittest.cc',
'plugin/bho/cookie_accountant_unittest.cc',
'plugin/bho/cookie_events_funnel_unittest.cc',
diff --git a/ceee/ie/plugin/bho/browser_helper_object.h b/ceee/ie/plugin/bho/browser_helper_object.h
index 8a699c3..7ff1688 100644
--- a/ceee/ie/plugin/bho/browser_helper_object.h
+++ b/ceee/ie/plugin/bho/browser_helper_object.h
@@ -22,10 +22,10 @@
#include "base/win/scoped_bstr.h"
#include "base/win/scoped_comptr.h"
#include "base/task.h"
-#include "base/win/rgs_helper.h"
#include "ceee/ie/broker/broker_rpc_client.h"
#include "ceee/ie/plugin/bho/tab_events_funnel.h"
#include "ceee/ie/common/chrome_frame_host.h"
+#include "ceee/ie/common/rgs_helper.h"
#include "ceee/ie/plugin/bho/frame_event_handler.h"
#include "ceee/ie/plugin/bho/extension_port_manager.h"
#include "ceee/ie/plugin/bho/tool_band_visibility.h"
diff --git a/ceee/ie/plugin/bho/executor.h b/ceee/ie/plugin/bho/executor.h
index 63ec87a..414d76b 100644
--- a/ceee/ie/plugin/bho/executor.h
+++ b/ceee/ie/plugin/bho/executor.h
@@ -15,7 +15,7 @@
#include "base/scoped_ptr.h"
#include "base/task.h"
-#include "base/win/rgs_helper.h"
+#include "ceee/ie/common/rgs_helper.h"
#include "ceee/ie/plugin/bho/infobar_manager.h"
#include "ceee/ie/plugin/toolband/resource.h"
diff --git a/ceee/ie/plugin/toolband/tool_band.h b/ceee/ie/plugin/toolband/tool_band.h
index da183ef..543a2ea 100644
--- a/ceee/ie/plugin/toolband/tool_band.h
+++ b/ceee/ie/plugin/toolband/tool_band.h
@@ -21,7 +21,7 @@
#include "base/basictypes.h"
#include "base/scoped_ptr.h"
#include "base/win/scoped_comptr.h"
-#include "base/win/rgs_helper.h"
+#include "ceee/ie/common/rgs_helper.h"
#include "ceee/ie/plugin/toolband/resource.h"
#include "chrome_tab.h" // NOLINT