summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-14 23:27:27 +0000
committerjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-14 23:27:27 +0000
commit038832b0c1524143beba0dbb773d2681b16c9d39 (patch)
tree3ba7baf6fe2498023c1a659038777aa079887e78 /chrome/browser
parent926bfeb46656408f24eb4a5bb09368f4c88875d1 (diff)
downloadchromium_src-038832b0c1524143beba0dbb773d2681b16c9d39.zip
chromium_src-038832b0c1524143beba0dbb773d2681b16c9d39.tar.gz
chromium_src-038832b0c1524143beba0dbb773d2681b16c9d39.tar.bz2
Use the ALLOW_THIS_IN_INITIALIZER_LIST instead of a pragma.
R=dank Review URL: http://codereview.chromium.org/21378 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9829 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/sessions/base_session_service.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/chrome/browser/sessions/base_session_service.cc b/chrome/browser/sessions/base_session_service.cc
index 48fd901..eacdc73 100644
--- a/chrome/browser/sessions/base_session_service.cc
+++ b/chrome/browser/sessions/base_session_service.cc
@@ -71,10 +71,7 @@ BaseSessionService::BaseSessionService(SessionType type,
: profile_(profile),
path_(path),
backend_thread_(NULL),
-#if defined(OS_WIN)
-#pragma warning(suppress: 4355) // Okay to pass "this" here.
-#endif
- save_factory_(this),
+ ALLOW_THIS_IN_INITIALIZER_LIST(save_factory_(this)),
pending_reset_(false),
commands_since_reset_(0) {
if (profile) {