summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/common.scons6
-rw-r--r--chrome/common/security_filter_peer.h2
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);