| Index: chrome/common/chrome_constants.cc
|
| ===================================================================
|
| --- chrome/common/chrome_constants.cc (revision 23255)
|
| +++ chrome/common/chrome_constants.cc (working copy)
|
| @@ -77,6 +77,7 @@
|
| const FilePath::CharType kCustomDictionaryFileName[] =
|
| FPL("Custom Dictionary.txt");
|
| const FilePath::CharType kLoginDataFileName[] = FPL("Login Data");
|
| +const FilePath::CharType kJumpListIconDirname[] = FPL("JumpListIcons");
|
|
|
| // This number used to be limited to 32 in the past (see b/535234).
|
| const unsigned int kMaxRendererProcessCount = 42;
|
|
|
| Property changes on: chrome\common\chrome_constants.cc
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
| Merged /branches/chrome_webkit_merge_branch/chrome/common/chrome_constants.cc:r69-2775
|
| Merged /trunk/src/chrome/common/chrome_constants.cc:r21522
|
|
|
|
|