diff options
author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-16 21:46:14 +0000 |
---|---|---|
committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-16 21:46:14 +0000 |
commit | fa41969da48955ec4b4ab30589db22322e065a32 (patch) | |
tree | 4a165afed24e0c4dc38bcd485100d8d56397da40 /webkit/glue/webframe_impl.cc | |
parent | 812eaca72f309bcbb51ee8f386a7d33429c3a314 (diff) | |
download | chromium_src-fa41969da48955ec4b4ab30589db22322e065a32.zip chromium_src-fa41969da48955ec4b4ab30589db22322e065a32.tar.gz chromium_src-fa41969da48955ec4b4ab30589db22322e065a32.tar.bz2 |
Replace MSVC pragmas with the macro. Also adds two files
from webkit/glue to the build rule.
Patch from icefox (TorchMobile)
http://codereview.chromium.org/7418
Review URL: http://codereview.chromium.org/7454
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3490 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webframe_impl.cc')
-rw-r--r-- | webkit/glue/webframe_impl.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc index 6ef003b..4710e21 100644 --- a/webkit/glue/webframe_impl.cc +++ b/webkit/glue/webframe_impl.cc @@ -77,12 +77,13 @@ #include "config.h" +#include "base/compiler_specific.h" #include "build/build_config.h" #include <algorithm> #include <string> -#pragma warning(push, 0) +MSVC_PUSH_WARNING_LEVEL(0); #include "HTMLFormElement.h" // need this before Document.h #include "Chrome.h" #include "ChromeClientChromium.h" @@ -122,7 +123,7 @@ #include "WidgetClientChromium.h" #include "XPathResult.h" -#pragma warning(pop) +MSVC_POP_WARNING(); #undef LOG #include "base/gfx/bitmap_platform_device.h" |