[Mac, Win] Don't allow blank spaces in profile names in the new avatar bubble.

chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm

 // Copyright 2014 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 <Cocoa/Cocoa.h>
 
 #import "chrome/browser/ui/cocoa/profiles/profile_chooser_controller.h"
 
 #include "base/mac/bundle_locations.h"
 #include "base/prefs/pref_service.h"
@@ skipping 605 matching lines @@
     [self setBordered:NO];
     [self setFont:[NSFont labelFontOfSize:kTitleFontSize]];
     [self setAlignment:NSCenterTextAlignment];
     [[self cell] setLineBreakMode:NSLineBreakByTruncatingTail];
     [self setTitle:profileName];
   }
   return self;
 }
 
 - (void)saveProfileName:(id)sender {
-  NSString* text = [profileNameTextField_ stringValue];
+  NSString* originalText = [profileNameTextField_ stringValue];
+  base::string16 newProfileName = base::SysNSStringToUTF16(originalText);
+
   // Empty profile names are not allowed, and are treated as a cancel.
-  if ([text length] > 0) {
-    profiles::UpdateProfileName(profile_, base::SysNSStringToUTF16(text));
+  base::TrimWhitespace(newProfileName, base::TRIM_ALL, &newProfileName);
+  if (!newProfileName.empty()) {
+    profiles::UpdateProfileName(profile_, newProfileName);
     [controller_
         postActionPerformed:ProfileMetrics::PROFILE_DESKTOP_MENU_EDIT_NAME];
-    [self setTitle:text];
+    [self setTitle:originalText];

[Alexei Svitkine (slow), 2014/08/15 17:40:46]

If this really needs to be |originalText| instead of |newProfileName|, please
add a comment explaining why, else it looks like a bug.

[noms (inactive), 2014/08/15 18:14:28]

Oh, now that I am doing the trimming you're right, it's worth converting back to
an NSString*. I was just trying to (incorrectly) save a conversion.

On 2014/08/15 17:40:46, Alexei Svitkine wrote:

   }
   [profileNameTextField_ setHidden:YES];
 }
 
 - (void)showEditableView:(id)sender {
+  // Update the textbox to the correct string, just in case we had previously
+  // entered a string that was rejected (eg. all spaces).

[Alexei Svitkine (slow), 2014/08/15 17:40:47]

If the previous string was rejected, then it wouldn't ever be set as the title,
so this comment doesn't seem correct to me.

[noms (inactive), 2014/08/15 18:14:28]

If the string is incorrect, we cancel editing, don't set the button title, but
the old, rejected text is still in the textbox and shouldn't be. I have moved
this to the  "if it's rejected" case above to make it clearer.

On 2014/08/15 17:40:47, Alexei Svitkine wrote:

+  [profileNameTextField_ setStringValue:[self title]];
   [profileNameTextField_ setHidden:NO];
   [[self window] makeFirstResponder:profileNameTextField_];
 }
 
 @end
 
 // A custom button that allows for setting a background color when hovered over.
 @interface BackgroundColorHoverButton : HoverImageButton {
  @private
   base::scoped_nsobject<NSColor> backgroundColor_;
@@ skipping 1312 matching lines @@
 }
 
 - (bool)shouldShowGoIncognito {
   bool incognitoAvailable =
       IncognitoModePrefs::GetAvailability(browser_->profile()->GetPrefs()) !=
           IncognitoModePrefs::DISABLED;
   return incognitoAvailable && !browser_->profile()->IsGuestSession();
 }
 
 @end