diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-27 22:43:06 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-27 22:43:06 +0000 |
| commit | e60a409457cdc45aeca477d3e86156cfa485a9c8 (patch) | |
| tree | a2e546f73836ff177728229d3c3866e9a564d450 | |
| parent | 43d8684dcd47aeb40b81d903ce4c681627c89bfc (diff) | |
| download | chromium_src-e60a409457cdc45aeca477d3e86156cfa485a9c8.zip chromium_src-e60a409457cdc45aeca477d3e86156cfa485a9c8.tar.gz chromium_src-e60a409457cdc45aeca477d3e86156cfa485a9c8.tar.bz2 | |
A little porting in chrome/renderer.
Review URL: http://codereview.chromium.org/19045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8766 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/renderer/net/render_dns_master.cc | 5 | ||||
| -rw-r--r-- | chrome/renderer/renderer.scons | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/chrome/renderer/net/render_dns_master.cc b/chrome/renderer/net/render_dns_master.cc index 736c81e..beacec6 100644 --- a/chrome/renderer/net/render_dns_master.cc +++ b/chrome/renderer/net/render_dns_master.cc @@ -28,10 +28,7 @@ static const size_t kMAX_SUBMISSION_PER_TASK = 30; RenderDnsMaster::RenderDnsMaster() : c_string_queue_(1000), -#pragma warning(push) -#pragma warning(suppress: 4355) // Okay to pass "this" here. - render_dns_factory_(this) { -#pragma warning(pop) + ALLOW_THIS_IN_INITIALIZER_LIST(render_dns_factory_(this)) { Reset(); } diff --git a/chrome/renderer/renderer.scons b/chrome/renderer/renderer.scons index 30b5b0e..b799929 100644 --- a/chrome/renderer/renderer.scons +++ b/chrome/renderer/renderer.scons @@ -102,7 +102,6 @@ if env.Bit('linux'): 'chrome_plugin_host.cc', 'debug_message_handler.cc', 'external_js_object.cc', - 'net/render_dns_master.cc', 'plugin_channel_host.cc', 'render_view.cc', 'render_widget.cc', |