diff options
4 files changed, 8 insertions, 13 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 7eef3c1..f492ffd 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -8620,13 +8620,6 @@ Keep your key file in a safe place. You will need it to create new versions of y </message> <!-- File Browser --> - <message name="IDS_FILE_BROWSER_BODY_FONT_FAMILY" desc="Font family for the file dialog."> - sans-serif - </message> - <message name="IDS_FILE_BROWSER_BODY_FONT_SIZE" desc="Font size for the file dialog."> - 13px - </message> - <message name="IDS_FILE_BROWSER_ROOT_DIRECTORY_LABEL" desc="Root directory label."> Files </message> diff --git a/chrome/browser/extensions/extension_file_browser_private_api.cc b/chrome/browser/extensions/extension_file_browser_private_api.cc index 0340f4e..dc418f3 100644 --- a/chrome/browser/extensions/extension_file_browser_private_api.cc +++ b/chrome/browser/extensions/extension_file_browser_private_api.cc @@ -38,6 +38,7 @@ #include "content/browser/tab_contents/tab_contents.h" #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" +#include "grit/platform_locale_settings.h" #include "webkit/fileapi/file_system_context.h" #include "webkit/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_operation.h" @@ -1170,8 +1171,8 @@ bool FileDialogStringsFunction::RunImpl() { #define SET_STRING(ns, id) \ dict->SetString(#id, l10n_util::GetStringUTF16(ns##_##id)) - SET_STRING(IDS_FILE_BROWSER, BODY_FONT_FAMILY); - SET_STRING(IDS_FILE_BROWSER, BODY_FONT_SIZE); + SET_STRING(IDS, WEB_FONT_FAMILY); + SET_STRING(IDS, WEB_FONT_SIZE); SET_STRING(IDS_FILE_BROWSER, ROOT_DIRECTORY_LABEL); SET_STRING(IDS_FILE_BROWSER, DOWNLOADS_DIRECTORY_LABEL); diff --git a/chrome/browser/resources/file_manager/js/mock_chrome.js b/chrome/browser/resources/file_manager/js/mock_chrome.js index 1806cd4..adf7385 100644 --- a/chrome/browser/resources/file_manager/js/mock_chrome.js +++ b/chrome/browser/resources/file_manager/js/mock_chrome.js @@ -109,8 +109,9 @@ chrome.fileBrowserPrivate = { // Keep this list in sync with the strings in generated_resources.grd and // extension_file_manager_api.cc! callback({ - BODY_FONT_FAMILY: 'sans-serif', - BODY_FONT_SIZE: '13px', + // These two are from locale_settings*.grd + WEB_FONT_FAMILY: 'Chrome Droid Sans,Droid Sans Fallback,sans-serif', + WEB_FONT_SIZE: '84%', FILE_IS_DIRECTORY: 'Folder', PARENT_DIRECTORY: 'Parent Directory', diff --git a/chrome/browser/resources/file_manager/main.html b/chrome/browser/resources/file_manager/main.html index 6392065..0063219 100644 --- a/chrome/browser/resources/file_manager/main.html +++ b/chrome/browser/resources/file_manager/main.html @@ -81,8 +81,8 @@ --> <title>✇</title> </head> - <body i18n-values=".style.fontFamily:BODY_FONT_FAMILY; - .style.fontSize:BODY_FONT_SIZE"> + <body i18n-values=".style.fontFamily:WEB_FONT_FAMILY; + .style.fontSize:WEB_FONT_SIZE"> <commands> <command id="rename"></command> <command id="delete"></command> |