Remove image name

ios/chrome/browser/ui/browser_view_controller.mm

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "ios/chrome/browser/ui/browser_view_controller.h"
 
 #import <AssetsLibrary/AssetsLibrary.h>
 #import <MobileCoreServices/MobileCoreServices.h>
 #import <PassKit/PassKit.h>
 #import <Photos/Photos.h>
@@ skipping 15 matching lines @@
 #include "base/mac/bundle_locations.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/objc_property_releaser.h"
 #import "base/mac/scoped_block.h"
 #import "base/mac/scoped_nsobject.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/user_metrics.h"
 #include "base/metrics/user_metrics_action.h"
-#include "base/strings/string_piece.h"
-#include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "components/bookmarks/browser/base_bookmark_model_observer.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/infobars/core/infobar_manager.h"
 #include "components/prefs/pref_service.h"
 #include "components/reading_list/core/reading_list_switches.h"
 #include "components/reading_list/ios/reading_list_model.h"
 #include "components/search_engines/search_engines_pref_names.h"
 #include "components/search_engines/template_url_service.h"
 #include "components/sessions/core/tab_restore_service_helper.h"
@@ skipping 635 matching lines @@
 - (void)showErrorAlert:(int)titleMessageId message:(int)messageId;
 // Helper method displaying an alert with the given title and message.
 // Dismisses previous alert if it has not been dismissed yet.
 - (void)showErrorAlertWithStringTitle:(NSString*)title
                               message:(NSString*)message;
 // Shows a self-dismissing snackbar displaying |message|.
 - (void)showSnackbar:(NSString*)message;
 // Induces an intentional crash in the browser process.
 - (void)induceBrowserCrash;
 // Saves the image or display error message, based on privacy settings.
-- (void)managePermissionAndSaveImage:(NSData*)data fileName:(NSString*)fileName;
+- (void)managePermissionAndSaveImage:(NSData*)data;
 // Saves the image. In order to keep the metadata of the image, the image is
 // saved as a temporary file on disk then saved in photos.
 // This should be called on FILE thread.
-- (void)saveImage:(NSData*)data fileName:(NSString*)fileName;
+- (void)saveImage:(NSData*)data;
 // Called when Chrome has been denied access to the photos or videos and the
 // user can change it.
 // Shows a privacy alert on the main queue, allowing the user to go to Chrome's
 // settings. Dismiss previous alert if it has not been dismissed yet.
 - (void)displayImageErrorAlertWithSettingsOnMainQueue;
 // Shows a privacy alert allowing the user to go to Chrome's settings. Dismiss
 // previous alert if it has not been dismissed yet.
 - (void)displayImageErrorAlertWithSettings:(NSURL*)settingURL;
 // Called when Chrome has been denied access to the photos or videos and the
 // user cannot change it.
@@ skipping 2330 matching lines @@
       search_args, templateUrlService->search_terms_data(), &post_content));
   [self addSelectedTabWithURL:result
                      postData:&post_content
                    transition:ui::PAGE_TRANSITION_TYPED];
 }
 
 - (void)saveImageAtURL:(const GURL&)url
               referrer:(const web::Referrer&)referrer {
   DCHECK(url.is_valid());
 
-  NSString* fileName = [NSString
-      stringWithFormat:@"%@.png",
-                       [[NSProcessInfo processInfo] globallyUniqueString]];
-
-  if (url.SchemeIs(base::StringPiece("data"))) {
-    if (!base::StartsWith(url.GetContent(), "image",
-                          base::CompareCase::INSENSITIVE_ASCII)) {
-      // Not an image, return.
-      return;
-    }
-
-    // Find the type of the image. It should be positionned like here:
-    // "image/png;base...", between the '/' and the ';'.
-    size_t semiColonPosition = url.GetContent().find(std::string(";"));
-    size_t slashPosition = url.GetContent().find(std::string("/"));
-    size_t substrLength = semiColonPosition - slashPosition - 1;
-    if (substrLength > 1) {
-      // Make sure there is a type.
-      fileName = [NSString
-          stringWithFormat:@"image.%@",
-                           base::SysUTF8ToNSString(url.GetContent().substr(
-                               slashPosition + 1, substrLength))];
-    }
-  } else {
-    fileName = base::SysUTF8ToNSString(url.ExtractFileName());
-  }
-
   web::ImageFetchedCallback callback =
       ^(const GURL& original_url, int response_code, NSData* data) {
         DCHECK(data);
 
-        [self managePermissionAndSaveImage:data fileName:fileName];
+        [self managePermissionAndSaveImage:data];
       };
   _imageFetcher->StartDownload(
       url, callback, web::ReferrerHeaderValueForNavigation(url, referrer),
       web::PolicyForNavigation(url, referrer));
 }
 
-- (void)managePermissionAndSaveImage:(NSData*)data
-                            fileName:(NSString*)fileName {
+- (void)managePermissionAndSaveImage:(NSData*)data {
   switch ([PHPhotoLibrary authorizationStatus]) {
     // User was never asked for permission to access photos.
     case PHAuthorizationStatusNotDetermined:
       [PHPhotoLibrary requestAuthorization:^(PHAuthorizationStatus status) {
         // Call -saveImage again to check if chrome needs to display an error or
         // saves the image.
         if (status != PHAuthorizationStatusNotDetermined)
-          [self managePermissionAndSaveImage:data fileName:fileName];
+          [self managePermissionAndSaveImage:data];
       }];
       break;
 
     // The application doesn't have permission to access photo and the user
     // cannot grant it.
     case PHAuthorizationStatusRestricted:
       [self displayPrivacyErrorAlertOnMainQueue:
                 l10n_util::GetNSString(
                     IDS_IOS_SAVE_IMAGE_RESTRICTED_PRIVACY_ALERT_MESSAGE)];
       break;
 
     // The application doesn't have permission to access photo and the user
     // can grant it.
     case PHAuthorizationStatusDenied:
       [self displayImageErrorAlertWithSettingsOnMainQueue];
       break;
 
     // The application has permission to access the photos.
     default: {
       web::WebThread::PostTask(web::WebThread::FILE, FROM_HERE,
                                base::BindBlock(^{
-                                 [self saveImage:data fileName:fileName];
+                                 [self saveImage:data];
                                }));
       break;
     }
   }
 }
 
-- (void)saveImage:(NSData*)data fileName:(NSString*)fileName {
+- (void)saveImage:(NSData*)data {
+  NSString* fileName = [NSString

[marq (ping after 24h), 2016/12/21 08:47:00]

nit: If you're just concatenating strings you can use -stringByappendingString:

[[[NSProcessInfo processInfo] globallyUniqueString]
stringByAppendingString:@".png"];

[gambard, 2016/12/21 13:02:11]

Done.

+      stringWithFormat:@"%@%@",
+                       [[NSProcessInfo processInfo] globallyUniqueString],
+                       @".png"];
   NSURL* fileURL =
       [NSURL fileURLWithPath:[NSTemporaryDirectory()
                                  stringByAppendingPathComponent:fileName]];
   NSError* error = nil;
   [data writeToURL:fileURL options:NSDataWritingAtomic error:&error];
 
   // Error while writing the image to disk.
   if (error) {
     NSString* errorMessage = [NSString
         stringWithFormat:@"%@ (%@ %" PRIdNS ")", [error localizedDescription],
@@ skipping 1979 matching lines @@
 
 - (UIView*)voiceSearchButton {
   return _voiceSearchButton;
 }
 
 - (id<LogoAnimationControllerOwner>)logoAnimationControllerOwner {
   return [self currentLogoAnimationControllerOwner];
 }
 
 @end