summaryrefslogtreecommitdiffstats
path: root/chrome/browser/net
diff options
context:
space:
mode:
authorpinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-02 21:39:56 +0000
committerpinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-02 21:39:56 +0000
commitb38feea4e79a698281b4de90a0e18f097c98bffb (patch)
tree9d25cb13f065764d4ba74a0f4d088edd18664cc6 /chrome/browser/net
parent685454d925ea207d0ae8600746214dfa08f099e2 (diff)
downloadchromium_src-b38feea4e79a698281b4de90a0e18f097c98bffb.zip
chromium_src-b38feea4e79a698281b4de90a0e18f097c98bffb.tar.gz
chromium_src-b38feea4e79a698281b4de90a0e18f097c98bffb.tar.bz2
add more files to mac chrome project, build a few more tests. Fix typo in scons file for darwin. Use compiler define for MSVC pragma.
Review URL: http://codereview.chromium.org/13060 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6244 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net')
-rw-r--r--chrome/browser/net/sdch_dictionary_fetcher.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/net/sdch_dictionary_fetcher.h b/chrome/browser/net/sdch_dictionary_fetcher.h
index 34d3f28..b2169b8 100644
--- a/chrome/browser/net/sdch_dictionary_fetcher.h
+++ b/chrome/browser/net/sdch_dictionary_fetcher.h
@@ -12,6 +12,7 @@
#include <queue>
#include <string>
+#include "base/compiler_specific.h"
#include "base/task.h"
#include "chrome/browser/url_fetcher.h"
#include "net/base/sdch_manager.h"
@@ -19,8 +20,9 @@
class SdchDictionaryFetcher : public URLFetcher::Delegate,
public SdchFetcher {
public:
- #pragma warning(suppress: 4355) // OK to pass "this" here.
- SdchDictionaryFetcher() : method_factory_(this), task_is_pending_(false) {}
+ SdchDictionaryFetcher() :
+ ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)),
+ task_is_pending_(false) {}
virtual ~SdchDictionaryFetcher() {}
// Implementation of SdchFetcher class.