diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-26 09:29:08 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-26 09:29:08 +0000 |
| commit | 1baa4f0d26b3bf8d48854a336a592ffa0d7672e4 (patch) | |
| tree | 386f9fa69ac9a0af8b2fbfff897109516d0bb230 /chrome/common | |
| parent | bb9cc1e68711c66f2145f26642fc1c4d3ce3f432 (diff) | |
| download | chromium_src-1baa4f0d26b3bf8d48854a336a592ffa0d7672e4.zip chromium_src-1baa4f0d26b3bf8d48854a336a592ffa0d7672e4.tar.gz chromium_src-1baa4f0d26b3bf8d48854a336a592ffa0d7672e4.tar.bz2 | |
Small porting in chrome/
This is actually http://codereview.chromium.org/18446 without
process_watcher changes.
Review URL: http://codereview.chromium.org/18724
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8622 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/common.scons | 6 | ||||
| -rw-r--r-- | chrome/common/security_filter_peer.h | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/chrome/common/common.scons b/chrome/common/common.scons index 7f2fd74..aa65c66 100644 --- a/chrome/common/common.scons +++ b/chrome/common/common.scons @@ -218,13 +218,9 @@ if not env.Bit('windows'): 'gfx/icon_util.cc', 'gfx/path.cc', 'ipc_logging.cc', - 'jstemplate_builder.cc', 'os_exchange_data.cc', 'plugin_messages.cc', 'process_watcher.cc', - 'security_filter_peer.cc', - 'win_safe_util.cc', - 'win_util.cc', ) if not env.Bit('windows'): @@ -235,6 +231,8 @@ if not env.Bit('windows'): 'gfx/chrome_font_win.cc', 'ipc_channel_win.cc', 'resource_bundle_win.cc', + 'win_safe_util.cc', + 'win_util.cc', '$CHROME_DIR/tools/build/win/precompiled$OBJSUFFIX', ) diff --git a/chrome/common/security_filter_peer.h b/chrome/common/security_filter_peer.h index 616680d..ef19b71 100644 --- a/chrome/common/security_filter_peer.h +++ b/chrome/common/security_filter_peer.h @@ -50,8 +50,8 @@ class SecurityFilterPeer : public webkit_glue::ResourceLoaderBridge::Peer { SecurityFilterPeer(webkit_glue::ResourceLoaderBridge* resource_loader_bridge, webkit_glue::ResourceLoaderBridge::Peer* peer); - webkit_glue::ResourceLoaderBridge* resource_loader_bridge_; webkit_glue::ResourceLoaderBridge::Peer* original_peer_; + webkit_glue::ResourceLoaderBridge* resource_loader_bridge_; private: DISALLOW_EVIL_CONSTRUCTORS(SecurityFilterPeer); |