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

Unified Diff: ui/file_manager/file_manager/background/js/import_history.js

Issue 886483004: Include a machine id in log files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Respond to review comments. Created 5 years, 11 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
« no previous file with comments | « no previous file | ui/file_manager/file_manager/common/js/importer_common.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/file_manager/file_manager/background/js/import_history.js
diff --git a/ui/file_manager/file_manager/background/js/import_history.js b/ui/file_manager/file_manager/background/js/import_history.js
index 39acc350f06cf2c931f5e15396db31fd11d2a8c2..17a92961d8d17e10963a47a9493b7966ad5c5119 100644
--- a/ui/file_manager/file_manager/background/js/import_history.js
+++ b/ui/file_manager/file_manager/background/js/import_history.js
@@ -1052,9 +1052,6 @@ importer.DriveSyncWatcher.prototype.getSyncStatus_ =
}.bind(this));
};
-/** @const {string} */
-importer.HISTORY_FILE_NAME = 'import-history.r1.log';
-
/**
* History loader that provides an ImportHistorty appropriate
* to user settings (if import history is enabled/disabled).
@@ -1086,13 +1083,16 @@ importer.RuntimeHistoryLoader.prototype.getHistory = function() {
* @this {importer.RuntimeHistoryLoader}
*/
function(enabled) {
- var loader = enabled ?
- new importer.SynchronizedHistoryLoader(
- new importer.ChromeSyncFileEntryProvider(
- importer.HISTORY_FILE_NAME)) :
- new importer.DummyImportHistory(false);
-
- this.historyResolver_.resolve(loader.getHistory());
+ importer.getHistoryFilename().then(
+ function(filename) {
+ var loader = enabled ?
+ new importer.SynchronizedHistoryLoader(
+ new importer.ChromeSyncFileEntryProvider(
+ filename)) :
+ new importer.DummyImportHistory(false);
+
+ this.historyResolver_.resolve(loader.getHistory());
+ }.bind(this));
}.bind(this));
}
« no previous file with comments | « no previous file | ui/file_manager/file_manager/common/js/importer_common.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698