diff options
author | deanm@google.com <deanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-02 15:11:22 +0000 |
---|---|---|
committer | deanm@google.com <deanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-02 15:11:22 +0000 |
commit | a4feef8f23c9aed533bcd8b35e594fe3cf300a23 (patch) | |
tree | 9ce681a0ae7b0a30d00b54cb8bccc3a3ad7562c6 /chrome/browser/history/text_database_manager.cc | |
parent | 5f945e0f45394453602083b22206acb4cde3db4f (diff) | |
download | chromium_src-a4feef8f23c9aed533bcd8b35e594fe3cf300a23.zip chromium_src-a4feef8f23c9aed533bcd8b35e594fe3cf300a23.tar.gz chromium_src-a4feef8f23c9aed533bcd8b35e594fe3cf300a23.tar.bz2 |
Port some more of chrome/ to Linux.
Original review: http://codereview.chromium.org/4247
Patch from Pawel Hajdan Jr.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2793 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/history/text_database_manager.cc')
-rw-r--r-- | chrome/browser/history/text_database_manager.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/history/text_database_manager.cc b/chrome/browser/history/text_database_manager.cc index 9bb1ba7..e96aa5b 100644 --- a/chrome/browser/history/text_database_manager.cc +++ b/chrome/browser/history/text_database_manager.cc @@ -4,6 +4,7 @@ #include "chrome/browser/history/text_database_manager.h" +#include "base/compiler_specific.h" #include "base/file_util.h" #include "base/histogram.h" #include "base/logging.h" @@ -70,8 +71,7 @@ TextDatabaseManager::TextDatabaseManager(const std::wstring& dir, transaction_nesting_(0), db_cache_(DBCache::NO_AUTO_EVICT), present_databases_loaded_(false), -#pragma warning(suppress: 4355) // Okay to pass "this" here. - factory_(this) { + ALLOW_THIS_IN_INITIALIZER_LIST(factory_(this)) { } TextDatabaseManager::~TextDatabaseManager() { |