| Index: chrome/common/chrome_constants.h
|
| ===================================================================
|
| --- chrome/common/chrome_constants.h (revision 23255)
|
| +++ chrome/common/chrome_constants.h (working copy)
|
| @@ -44,6 +44,7 @@
|
| extern const FilePath::CharType kHistoryBookmarksFileName[];
|
| extern const FilePath::CharType kCustomDictionaryFileName[];
|
| extern const FilePath::CharType kLoginDataFileName[];
|
| +extern const FilePath::CharType kJumpListIconDirname[];
|
|
|
| extern const unsigned int kMaxRendererProcessCount;
|
| extern const int kStatsMaxThreads;
|
|
|
| Property changes on: chrome\common\chrome_constants.h
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
| Merged /branches/chrome_webkit_merge_branch/chrome/common/chrome_constants.h:r69-2775
|
| Merged /trunk/src/chrome/common/chrome_constants.h:r21522
|
|
|
|
|