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

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

Issue 8461009: Fixing exit on 'X' icon in Photo Editor (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 9 years, 1 month 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
« no previous file with comments | « no previous file | chrome/browser/resources/file_manager/js/mock_chrome.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 c41b1c393f84514275b57ee777e85086be71912f..d36a8e265384de62d4a43eddb108cb47514292af 100644
--- a/chrome/browser/resources/file_manager/js/file_manager.js
+++ b/chrome/browser/resources/file_manager/js/file_manager.js
@@ -9,8 +9,6 @@ const EMPTY_IMAGE_URI = 'data:image/gif;base64,'
var g_slideshow_data = null;
-const GALLERY_ENABLED = true;
-
// If directory files changes too often, don't rescan directory more than once
// per specified interval
const SIMULTANEOUS_RESCAN_INTERVAL = 1000;
@@ -2269,7 +2267,6 @@ FileManager.prototype = {
selectedUrl,
function () {
// TODO(kaznacheev): keep selection.
- self.rescanDirectoryNow_(); // Make sure new files show up.
self.dialogDom_.removeChild(galleryFrame);
self.document_.title = self.currentDirEntry_.fullPath;
self.refocus();
@@ -3064,6 +3061,11 @@ FileManager.prototype = {
function onReadSome(entries) {
if (entries.length == 0) {
+ metrics.recordTime('DirectoryScan');
+ if (self.currentDirEntry_.fullPath == DOWNLOADS_DIRECTORY) {
+ metrics.reportCount("DownloadsCount", self.dataModel_.length);
+ }
+
if (self.pendingRescanQueue_.length > 0) {
setTimeout(self.rescanDirectory_.bind(self),
SIMULTANEOUS_RESCAN_INTERVAL);
@@ -3099,6 +3101,8 @@ FileManager.prototype = {
spliceArgs.unshift(0, 0); // index, deleteCount
self.dataModel_.splice.apply(self.dataModel_, spliceArgs);
+ metrics.startInterval('DirectoryScan');
+
// Keep reading until entries.length is 0.
reader.readEntries(onReadSome, onError);
};
« no previous file with comments | « no previous file | chrome/browser/resources/file_manager/js/mock_chrome.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698