diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-05 19:16:23 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-05 19:16:23 +0000 |
| commit | ea9ed97d074fa3ae84486f952eb66ea1e95ce37e (patch) | |
| tree | d4603d01863ded8450e4d3109bf56d406e2c1d1a /chrome_frame/chrome_tab.cc | |
| parent | 880b6f26f7cda4ddefbf2c269a2ec86dce71c2ff (diff) | |
| download | chromium_src-ea9ed97d074fa3ae84486f952eb66ea1e95ce37e.zip chromium_src-ea9ed97d074fa3ae84486f952eb66ea1e95ce37e.tar.gz chromium_src-ea9ed97d074fa3ae84486f952eb66ea1e95ce37e.tar.bz2 | |
Some Chrome Frame cleanup:
1) Rearrange the chrome_frame.gyp file to:
a) Split out most of CF into a static lib to make writing unit tests easier (not having to re-include source files).
b) Remove most of the un-needed xulrunner-sdk includes.
2) Move all OBJECT_ENTRY_AUTO macros to chrome_tab.cc since they don't work without extra work when residing in a lib.
3) Rename npchrome_tab.dll to npchrome_frame.dll.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/523040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35543 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_tab.cc')
| -rw-r--r-- | chrome_frame/chrome_tab.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/chrome_frame/chrome_tab.cc b/chrome_frame/chrome_tab.cc index 0783a61..9944f5b 100644 --- a/chrome_frame/chrome_tab.cc +++ b/chrome_frame/chrome_tab.cc @@ -24,9 +24,12 @@ #include "chrome/common/chrome_constants.h" #include "grit/chrome_frame_resources.h" #include "chrome_frame/bho.h" +#include "chrome_frame/chrome_active_document.h" +#include "chrome_frame/chrome_frame_activex.h" #include "chrome_frame/chrome_frame_automation.h" #include "chrome_frame/chrome_frame_reporting.h" #include "chrome_frame/chrome_launcher.h" +#include "chrome_frame/chrome_protocol.h" #include "chrome_frame/resource.h" #include "chrome_frame/utils.h" @@ -44,6 +47,12 @@ static const GUID kChromeFrameProvider = { 0x562bfc3, 0x2550, 0x45b4, { 0xbd, 0x8e, 0xa3, 0x10, 0x58, 0x3d, 0x3a, 0x6f } }; +// Object entries go here instead of with each object, so that we can move +// the objects to a lib. Also reduces magic. +OBJECT_ENTRY_AUTO(CLSID_ChromeFrameBHO, Bho) +OBJECT_ENTRY_AUTO(__uuidof(ChromeActiveDocument), ChromeActiveDocument) +OBJECT_ENTRY_AUTO(__uuidof(ChromeFrame), ChromeFrameActivex) +OBJECT_ENTRY_AUTO(__uuidof(ChromeProtocol), ChromeProtocol) class ChromeTabModule : public AtlPerUserModule<CAtlDllModuleT<ChromeTabModule> > { |