| Index: app/gfx/codec/jpeg_codec.cc
 | 
| ===================================================================
 | 
| --- app/gfx/codec/jpeg_codec.cc	(revision 0)
 | 
| +++ app/gfx/codec/jpeg_codec.cc	(working copy)
 | 
| @@ -2,7 +2,7 @@
 | 
|  // Use of this source code is governed by a BSD-style license that can be
 | 
|  // found in the LICENSE file.
 | 
|  
 | 
| -#include "base/gfx/jpeg_codec.h"
 | 
| +#include "app/gfx/codec/jpeg_codec.h"
 | 
|  
 | 
|  #include <setjmp.h>
 | 
|  
 | 
| @@ -18,6 +18,8 @@
 | 
|  #endif
 | 
|  }
 | 
|  
 | 
| +namespace gfx {
 | 
| +
 | 
|  // Encoder/decoder shared stuff ------------------------------------------------
 | 
|  
 | 
|  namespace {
 | 
| @@ -525,3 +527,5 @@
 | 
|  
 | 
|    return bitmap;
 | 
|  }
 | 
| +
 | 
| +}  // namespace gfx
 | 
| 
 | 
| Property changes on: app/gfx/codec/jpeg_codec.cc
 | 
| ___________________________________________________________________
 | 
| Added: svn:mergeinfo
 | 
|    Merged /branches/chrome_webkit_merge_branch/base/gfx/jpeg_codec.cc:r69-2775
 | 
| 
 | 
| 
 |