Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2586)

Unified Diff: chrome/browser/resources/bookmark_manager/js/main.js

Issue 10244005: convert bookmark manager to loadTimeData from localStrings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/bookmark_manager/js/main.js
diff --git a/chrome/browser/resources/bookmark_manager/js/main.js b/chrome/browser/resources/bookmark_manager/js/main.js
index 072167cf79ce32401348d2a966fef314e74e2f62..666f8be59afe61b41db3cef5fcfd05fa4edd2165 100644
--- a/chrome/browser/resources/bookmark_manager/js/main.js
+++ b/chrome/browser/resources/bookmark_manager/js/main.js
@@ -17,12 +17,6 @@ const Promise = cr.Promise;
if (!chrome.bookmarks)
console.error('Bookmarks extension API is not available');
-/**
- * The local strings object which is used to do the translation.
- * @type {!LocalStrings}
- */
-var localStrings = new LocalStrings;
-
// Get the localized strings from the backend.
chrome.experimental.bookmarkManager.getStrings(function(data) {
// The strings may contain & which we need to strip.
@@ -30,11 +24,13 @@ chrome.experimental.bookmarkManager.getStrings(function(data) {
data[key] = data[key].replace(/&/, '');
}
- localStrings.templateData = data;
- i18nTemplate.process(document, data);
+ loadTimeData.data = data;
+ var process = document.createElement('script');
+ process.src = "chrome://resources/js/i18n_template2.js";
+ document.body.appendChild(process);
- recentTreeItem.label = localStrings.getString('recent');
- searchTreeItem.label = localStrings.getString('search');
+ recentTreeItem.label = loadTimeData.getString('recent');
+ searchTreeItem.label = loadTimeData.getString('search');
if (!isRTL())
searchTreeItem.icon = 'images/bookmark_manager_search.png'
else
@@ -875,18 +871,18 @@ function updateOpenCommands(e, command) {
var commandDisabled = false;
switch (command.id) {
case 'open-in-new-tab-command':
- command.label = localStrings.getString(multiple ?
+ command.label = loadTimeData.getString(multiple ?
'open_all' : 'open_in_new_tab');
break;
case 'open-in-new-window-command':
- command.label = localStrings.getString(multiple ?
+ command.label = loadTimeData.getString(multiple ?
'open_all_new_window' : 'open_in_new_window');
// Disabled when incognito is forced.
commandDisabled = incognitoModeAvailability == 'forced';
break;
case 'open-incognito-window-command':
- command.label = localStrings.getString(multiple ?
+ command.label = loadTimeData.getString(multiple ?
'open_all_incognito' : 'open_incognito');
// Not available withn incognito is disabled.
commandDisabled = incognitoModeAvailability == 'disabled';
@@ -1233,7 +1229,7 @@ var linkController;
*/
function getLinkController() {
return linkController ||
- (linkController = new cr.LinkController(localStrings));
+ (linkController = new cr.LinkController(loadTimeData));
}
/**
@@ -1336,7 +1332,7 @@ function newFolder() {
var parentId = list.parentId;
var isTree = document.activeElement == tree;
chrome.bookmarks.create({
- title: localStrings.getString('new_folder_name'),
+ title: loadTimeData.getString('new_folder_name'),
parentId: parentId
}, function(newNode) {
// This callback happens before the event that triggers the tree/list to

Powered by Google App Engine
This is Rietveld 408576698