diff options
author | olivierrobin <olivierrobin@chromium.org> | 2016-03-24 10:41:08 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-24 17:42:04 +0000 |
commit | 6bf70fab1fb0d91d082f42976c990909b6a83bdd (patch) | |
tree | 2e0186320da943cc314a15b5d4e1bf72539cd770 /ios/chrome/browser | |
parent | 2476ed2fc01e9d8a9603e8b3bb7e7bd311e26afa (diff) | |
download | chromium_src-6bf70fab1fb0d91d082f42976c990909b6a83bdd.zip chromium_src-6bf70fab1fb0d91d082f42976c990909b6a83bdd.tar.gz chromium_src-6bf70fab1fb0d91d082f42976c990909b6a83bdd.tar.bz2 |
Remove Keep Reading List Item Experimental flag.
Reading list has now a persistent storage and this flag is useless.
Review URL: https://codereview.chromium.org/1828983003
Cr-Commit-Position: refs/heads/master@{#383090}
Diffstat (limited to 'ios/chrome/browser')
-rw-r--r-- | ios/chrome/browser/experimental_flags.h | 5 | ||||
-rw-r--r-- | ios/chrome/browser/experimental_flags.mm | 6 | ||||
-rw-r--r-- | ios/chrome/browser/share_extension/share_extension_item_receiver.mm | 24 |
3 files changed, 11 insertions, 24 deletions
diff --git a/ios/chrome/browser/experimental_flags.h b/ios/chrome/browser/experimental_flags.h index a9a2285..ee80fcc 100644 --- a/ios/chrome/browser/experimental_flags.h +++ b/ios/chrome/browser/experimental_flags.h @@ -37,11 +37,6 @@ bool IsTabSwitcherEnabled(); // Whether the reading list is enabled. bool IsReadingListEnabled(); -// Whether the file sent by the share extension sould be deleted after being -// processed. If true, files will be reprocessed everytime the application is -// put in foreground. -bool IsReadingListKeepItemsEnabled(); - } // namespace experimental_flags #endif // IOS_CHROME_BROWSER_EXPERIMENTAL_FLAGS_H_ diff --git a/ios/chrome/browser/experimental_flags.mm b/ios/chrome/browser/experimental_flags.mm index 8f65c5e..52a2801 100644 --- a/ios/chrome/browser/experimental_flags.mm +++ b/ios/chrome/browser/experimental_flags.mm @@ -27,7 +27,6 @@ NSString* const kEnableViewCopyPasswords = @"EnableViewCopyPasswords"; NSString* const kHeuristicsForPasswordGeneration = @"HeuristicsForPasswordGeneration"; NSString* const kEnableReadingList = @"EnableReadingList"; -NSString* const kEnableReadingListKeepItems = @"EnableReadingListKeepItems"; } // namespace namespace experimental_flags { @@ -107,9 +106,4 @@ bool IsReadingListEnabled() { return [[NSUserDefaults standardUserDefaults] boolForKey:kEnableReadingList]; } -bool IsReadingListKeepItemsEnabled() { - return [[NSUserDefaults standardUserDefaults] - boolForKey:kEnableReadingListKeepItems]; -} - } // namespace experimental_flags diff --git a/ios/chrome/browser/share_extension/share_extension_item_receiver.mm b/ios/chrome/browser/share_extension/share_extension_item_receiver.mm index 0206ff2..d104fc4 100644 --- a/ios/chrome/browser/share_extension/share_extension_item_receiver.mm +++ b/ios/chrome/browser/share_extension/share_extension_item_receiver.mm @@ -263,19 +263,17 @@ void LogHistogramReceivedItem(ShareExtensionItemReceived type) { - (void)deleteFileAtURL:(NSURL*)url withCompletion:(ProceduralBlock)completion { DCHECK_CURRENTLY_ON(web::WebThread::FILE); - if (!experimental_flags::IsReadingListKeepItemsEnabled()) { - base::scoped_nsobject<NSFileCoordinator> deletingCoordinator( - [[NSFileCoordinator alloc] initWithFilePresenter:self]); - NSError* error = nil; - [deletingCoordinator - coordinateWritingItemAtURL:url - options:NSFileCoordinatorWritingForDeleting - error:&error - byAccessor:^(NSURL* newURL) { - [[NSFileManager defaultManager] removeItemAtURL:newURL - error:nil]; - }]; - } + base::scoped_nsobject<NSFileCoordinator> deletingCoordinator( + [[NSFileCoordinator alloc] initWithFilePresenter:self]); + NSError* error = nil; + [deletingCoordinator + coordinateWritingItemAtURL:url + options:NSFileCoordinatorWritingForDeleting + error:&error + byAccessor:^(NSURL* newURL) { + [[NSFileManager defaultManager] removeItemAtURL:newURL + error:nil]; + }]; if (completion) { completion(); } |