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

Unified Diff: chrome/browser/resources/file_manager/js/file_manager.js

Issue 18024002: Add the new window item to the Files.app's context menu on the launcher. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments + fixed. Created 7 years, 6 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/file_manager/js/file_manager.js
diff --git a/chrome/browser/resources/file_manager/js/file_manager.js b/chrome/browser/resources/file_manager/js/file_manager.js
index 08e892eaf10f70fc9f44e15fd700d93ed74fced3..50985cb4de1d45e76ac838541f81559bcd83444a 100644
--- a/chrome/browser/resources/file_manager/js/file_manager.js
+++ b/chrome/browser/resources/file_manager/js/file_manager.js
@@ -625,7 +625,7 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52;
Commands.newFolderCommand, this, this.directoryModel_);
CommandUtil.registerCommand(doc, 'newwindow',
- Commands.newWindowCommand, this);
+ Commands.newWindowCommand, this, this.directoryModel_);
CommandUtil.registerCommand(doc, 'change-default-app',
Commands.changeDefaultAppCommand, this);
@@ -790,11 +790,19 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52;
* @private
*/
FileManager.prototype.initStrings_ = function(callback) {
- chrome.fileBrowserPrivate.getStrings(function(strings) {
- loadTimeData.data = strings;
- this.loadTimeDataAvailable = true;
- callback();
- });
+ // Fetch the strings via the private api if running in the browser window.
+ // Otherwise, read cached strings from the local storage.
+ if (util.platform.runningInBrowser()) {
+ chrome.fileBrowserPrivate.getStrings(function(strings) {
+ loadTimeData.data = strings;
+ callback();
+ });
+ } else {
+ chrome.storage.local.get('strings', function(items) {
+ loadTimeData.data = items['strings'];
+ callback();
+ });
+ }
};
/**

Powered by Google App Engine
This is Rietveld 408576698