Fix include paths for libpng.

Review URL: http://codereview.chromium.org/27113

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10345 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 10 insertions, 11 deletions

diff --git a/base/gfx/png_decoder.cc b/base/gfx/png_decoder.cc
index 899cc0f..ac0cd7d 100644
--- a/base/gfx/png_decoder.cc
+++ b/base/gfx/png_decoder.cc
@@ -8,7 +8,7 @@
 #include "skia/include/SkBitmap.h"
 
 extern "C" {
-#include "png.h"
+#include "third_party/libpng/png.h"
 }
 
 namespace {
diff --git a/base/gfx/png_decoder.h b/base/gfx/png_decoder.h
index eea36e0..68b310f 100644
--- a/base/gfx/png_decoder.h
+++ b/base/gfx/png_decoder.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BASE_GFX_PNG_DECODER_H__
-#define BASE_GFX_PNG_DECODER_H__
+#ifndef BASE_GFX_PNG_DECODER_H_
+#define BASE_GFX_PNG_DECODER_H_
 
 #include <vector>
 
@@ -57,8 +57,7 @@ class PNGDecoder {
       std::vector<unsigned char>& bgra, int width, int height);
 
  private:
-  DISALLOW_EVIL_CONSTRUCTORS(PNGDecoder);
+  DISALLOW_COPY_AND_ASSIGN(PNGDecoder);
 };
 
-#endif  // BASE_GFX_PNG_DECODER_H__
-
+#endif  // BASE_GFX_PNG_DECODER_H_
diff --git a/base/gfx/png_encoder.cc b/base/gfx/png_encoder.cc
index 3349fd6..b47db42 100755
--- a/base/gfx/png_encoder.cc
+++ b/base/gfx/png_encoder.cc
@@ -8,7 +8,7 @@
 #include "skia/include/SkBitmap.h"
 
 extern "C" {
-#include "png.h"
+#include "third_party/libpng/png.h"
 }
 
 namespace {
diff --git a/base/gfx/png_encoder.h b/base/gfx/png_encoder.h
index 7d284be..90da8bb9 100755
--- a/base/gfx/png_encoder.h
+++ b/base/gfx/png_encoder.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BASE_GFX_PNG_ENCODER_H__
-#define BASE_GFX_PNG_ENCODER_H__
+#ifndef BASE_GFX_PNG_ENCODER_H_
+#define BASE_GFX_PNG_ENCODER_H_
 
 #include <vector>
 
@@ -62,8 +62,8 @@ class PNGEncoder {
                                  std::vector<unsigned char>* output);
 
  private:
-  DISALLOW_EVIL_CONSTRUCTORS(PNGEncoder);
+  DISALLOW_COPY_AND_ASSIGN(PNGEncoder);
 };
 
-#endif  // BASE_GFX_PNG_ENCODER_H__
+#endif  // BASE_GFX_PNG_ENCODER_H_