| Index: chrome/browser/bookmarks/bookmark_codec.h
 | 
| ===================================================================
 | 
| --- chrome/browser/bookmarks/bookmark_codec.h	(revision 1899)
 | 
| +++ chrome/browser/bookmarks/bookmark_codec.h	(working copy)
 | 
| @@ -6,7 +6,8 @@
 | 
|  // into JSON values. The encoded values are written to disk via the
 | 
|  // BookmarkService.
 | 
|  
 | 
| -#ifndef CHROME_BROWSER_BOOKMARK_CODEC_H_
 | 
| +#ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_CODEC_H_
 | 
| +#define CHROME_BROWSER_BOOKMARKS_BOOKMARK_CODEC_H_
 | 
|  
 | 
|  #include "base/basictypes.h"
 | 
|  
 | 
| @@ -63,5 +64,4 @@
 | 
|    DISALLOW_COPY_AND_ASSIGN(BookmarkCodec);
 | 
|  };
 | 
|  
 | 
| -#endif  // CHROME_BROWSER_BOOKMARK_CODEC_H_
 | 
| -
 | 
| +#endif  // CHROME_BROWSER_BOOKMARKS_BOOKMARK_CODEC_H_
 | 
| 
 | 
| Property changes on: chrome\browser\bookmarks\bookmark_codec.h
 | 
| ___________________________________________________________________
 | 
| Added: svn:mergeinfo
 | 
| 
 | 
| 
 |