diff options
| author | smckay <smckay@chromium.org> | 2014-11-20 19:27:39 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-21 03:27:57 +0000 |
| commit | 778dfafac96cda0b00c8176a3f968d9af42165da (patch) | |
| tree | bb5fa48b32374235e43cb12619109f04ed30aed4 /ui/file_manager | |
| parent | bf89c8f54bf8865d134e986f172e0b49a3906373 (diff) | |
| download | chromium_src-778dfafac96cda0b00c8176a3f968d9af42165da.zip chromium_src-778dfafac96cda0b00c8176a3f968d9af42165da.tar.gz chromium_src-778dfafac96cda0b00c8176a3f968d9af42165da.tar.bz2 | |
Use promise to check feature flag.
BUG=420680
TEST=browser_test: FileManagerJsTest.*
Review URL: https://codereview.chromium.org/739083002
Cr-Commit-Position: refs/heads/master@{#305156}
Diffstat (limited to 'ui/file_manager')
| -rw-r--r-- | ui/file_manager/file_manager/background/js/background.js | 30 | ||||
| -rw-r--r-- | ui/file_manager/file_manager/background/js/device_handler.js | 16 |
2 files changed, 22 insertions, 24 deletions
diff --git a/ui/file_manager/file_manager/background/js/background.js b/ui/file_manager/file_manager/background/js/background.js index 7d3744c..2b9663d 100644 --- a/ui/file_manager/file_manager/background/js/background.js +++ b/ui/file_manager/file_manager/background/js/background.js @@ -159,24 +159,18 @@ FileBrowserBackground.prototype = { * @return {!Promise.<!importer.HistoryLoader>} */ FileBrowserBackground.initHistoryLoader_ = function() { - return new Promise( - function(resolve) { - // Replaces the dummy history object with a real instance - // if cloud backup is enabled. - chrome.commandLinePrivate.hasSwitch( - 'enable-cloud-backup', - /** - * @param {boolean} enabled - * @this {!FileBrowserBackground} - */ - function(enabled) { - var loader = enabled ? - new importer.SynchronizedHistoryLoader( - new importer.ChromeSyncFileEntryProvider()) : - new importer.DummyImportHistory(false); - resolve(loader); - }); - }); + return importer.importEnabled() + .then( + /** + * @param {boolean} enabled + * @this {!FileBrowserBackground} + */ + function(enabled) { + return enabled ? + new importer.SynchronizedHistoryLoader( + new importer.ChromeSyncFileEntryProvider()) : + new importer.DummyImportHistory(false); + }); }; /** diff --git a/ui/file_manager/file_manager/background/js/device_handler.js b/ui/file_manager/file_manager/background/js/device_handler.js index 4d8c673..b25f320 100644 --- a/ui/file_manager/file_manager/background/js/device_handler.js +++ b/ui/file_manager/file_manager/background/js/device_handler.js @@ -29,13 +29,17 @@ function DeviceHandler() { * @private {boolean} */ this.mediaImportEnabled_ = false; + // Use the command line switch to enable this new feature. - chrome.commandLinePrivate.hasSwitch( - 'enable-cloud-backup', - /** @param {boolean} enabled */ - function(enabled) { - this.mediaImportEnabled_ = enabled; - }.bind(this)); + importer.importEnabled() + .then( + /** + * @param {boolean} enabled + * @this {DeviceHandler} + */ + function(enabled) { + this.mediaImportEnabled_ = enabled; + }.bind(this)); } DeviceHandler.prototype = { |