[Mac/multiprofile] "Customize User..." should edit the currently active profile

chrome/browser/ui/cocoa/profile_menu_controller.mm

 // Copyright (c) 2011 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 "chrome/browser/ui/cocoa/profile_menu_controller.h"
 
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/avatar_menu_model.h"
 #include "chrome/browser/profiles/avatar_menu_model_observer.h"
@@ skipping 65 matching lines @@
                withObject:nil
                afterDelay:0];
   }
   return self;
 }
 
 - (IBAction)switchToProfile:(id)sender {
   model_->SwitchToProfile([sender tag]);
 }
 
+- (IBAction)editCurrentProfile:(id)sender {

[Robert Sesek, 2011/10/11 14:23:13]

I don't think you need a new selector. You can only edit the current profile.

[jeremy, 2011/10/19 13:15:24]

Done.

+  model_->EditProfile(model_->GetActiveProfileIndex());
+}
+
 - (IBAction)editProfile:(id)sender {
   model_->EditProfile([sender tag]);
 }
 
 - (IBAction)newProfile:(id)sender {
   model_->AddNewProfile();
 }
 
 // Private /////////////////////////////////////////////////////////////////////
 
 - (NSMenu*)menu {
   return [mainMenuItem_ submenu];
 }
 
 - (void)initializeMenu {
   observer_.reset(new ProfileMenuControllerInternal::Observer(self));
   model_.reset(new AvatarMenuModel(
       &g_browser_process->profile_manager()->GetProfileInfoCache(),
       observer_.get(),
       NULL));
 
   [[self menu] addItem:[NSMenuItem separatorItem]];
 
   NSMenuItem* item =
       [self createItemWithTitle:l10n_util::GetNSStringWithFixup(
                                     IDS_PROFILES_CUSTOMIZE_PROFILE)
-                         action:@selector(editProfile:)];
+                         action:@selector(editCurrentProfile:)];
   [[self menu] addItem:item];
 
   [[self menu] addItem:[NSMenuItem separatorItem]];
   item = [self createItemWithTitle:l10n_util::GetNSStringWithFixup(
                                        IDS_PROFILES_CREATE_NEW_PROFILE_OPTION)
                             action:@selector(newProfile:)];
   [[self menu] addItem:item];
 
   [self rebuildMenu];
 }
 
 // Notifies the controller that the active browser has changed and that the
 // menu item and menu need to be updated to reflect that.
 - (void)activeBrowserChangedTo:(Browser*)browser {
   // Tell the model that the browser has changed.
   model_->set_browser(browser);
 
-  // Then find the profile to mark as active.
-  Profile* profile = NULL;
-  if (!browser)
-    profile = ProfileManager::GetLastUsedProfile();
-  else
-    profile = browser->profile();
-
-  ProfileInfoInterface& info =
-      g_browser_process->profile_manager()->GetProfileInfoCache();
-  size_t index = info.GetIndexOfProfileWithPath(profile->GetPath());
+  size_t active_profile_index = model_->GetActiveProfileIndex();
 
   // Update the state for the menu items.
   for (size_t i = 0; i < model_->GetNumberOfItems(); ++i) {
     size_t tag = model_->GetItemAt(i).model_index;
-    [[[self menu] itemWithTag:tag] setState:index == tag ? NSOnState
-                                                         : NSOffState];
+    bool is_active = active_profile_index == tag;

[Robert Sesek, 2011/10/11 14:23:13]

Use ObjC BOOL

[jeremy, 2011/10/19 13:15:24]

Done.

+    [[[self menu] itemWithTag:tag] setState:is_active ? NSOnState : NSOffState];
   }
 }
 
 - (void)rebuildMenu {
   NSMenu* menu = [self menu];
 
   for (NSMenuItem* item = [menu itemAtIndex:0];
        ![item isSeparatorItem];
        item = [menu itemAtIndex:0]) {
     [menu removeItemAtIndex:0];
@@ skipping 13 matching lines @@
 }
 
 - (NSMenuItem*)createItemWithTitle:(NSString*)title action:(SEL)sel {
   scoped_nsobject<NSMenuItem> item(
       [[NSMenuItem alloc] initWithTitle:title action:sel keyEquivalent:@""]);
   [item setTarget:self];
   return [item.release() autorelease];
 }
 
 @end