diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-31 11:58:24 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-31 11:58:24 +0000 |
| commit | 3ba7f3741449eca4e44b6424ff6671adb168fbf5 (patch) | |
| tree | fecdd632ff5c45de9ad7661a7e740cee15a3a1c0 /chrome/common | |
| parent | bb66460c2372e1507e7f58f62ea5a09f9b8f5f57 (diff) | |
| download | chromium_src-3ba7f3741449eca4e44b6424ff6671adb168fbf5.zip chromium_src-3ba7f3741449eca4e44b6424ff6671adb168fbf5.tar.gz chromium_src-3ba7f3741449eca4e44b6424ff6671adb168fbf5.tar.bz2 | |
Porting in chrome/
Review URL: http://codereview.chromium.org/17016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7529 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/common.scons | 2 | ||||
| -rw-r--r-- | chrome/common/resource_dispatcher.cc | 4 | ||||
| -rw-r--r-- | chrome/common/resource_dispatcher.h | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/chrome/common/common.scons b/chrome/common/common.scons index a86aa6b..d16afc5 100644 --- a/chrome/common/common.scons +++ b/chrome/common/common.scons @@ -81,6 +81,7 @@ if not env.Bit('mac'): # TODO(port): Port to Mac. input_files.extend([ 'pref_service.cc', + 'resource_dispatcher.cc', 'time_format.cc', ]) @@ -107,7 +108,6 @@ if env.Bit('windows'): 'plugin_messages.cc', 'process_watcher.cc', 'resource_bundle.cc', - 'resource_dispatcher.cc', 'security_filter_peer.cc', 'win_safe_util.cc', 'win_util.cc', diff --git a/chrome/common/resource_dispatcher.cc b/chrome/common/resource_dispatcher.cc index ecf58e6..822a720 100644 --- a/chrome/common/resource_dispatcher.cc +++ b/chrome/common/resource_dispatcher.cc @@ -7,6 +7,7 @@ #include "chrome/common/resource_dispatcher.h" #include "base/basictypes.h" +#include "base/compiler_specific.h" #include "base/message_loop.h" #include "base/shared_memory.h" #include "base/string_util.h" @@ -235,8 +236,7 @@ void IPCResourceLoaderBridge::SyncLoad(SyncLoadResponse* response) { ResourceDispatcher::ResourceDispatcher(IPC::Message::Sender* sender) : message_sender_(sender), -#pragma warning(suppress: 4355) - method_factory_(this) { + ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) { } ResourceDispatcher::~ResourceDispatcher() { diff --git a/chrome/common/resource_dispatcher.h b/chrome/common/resource_dispatcher.h index e948045..13372a9 100644 --- a/chrome/common/resource_dispatcher.h +++ b/chrome/common/resource_dispatcher.h @@ -7,8 +7,6 @@ #ifndef CHROME_COMMON_RESOURCE_DISPATCHER_H__ #define CHROME_COMMON_RESOURCE_DISPATCHER_H__ -#include <windows.h> - #include <queue> #include "base/hash_tables.h" |