After locking a profile and showing the User Manager, make Guest the active profile

chrome/browser/ui/cocoa/profiles/user_manager_mac.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.
 
 #include "chrome/browser/ui/cocoa/profiles/user_manager_mac.h"
 
+#include "base/mac/foundation_util.h"
 #include "chrome/app/chrome_command_ids.h"
+#import "chrome/browser/app_controller_mac.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #import "chrome/browser/ui/cocoa/browser_window_utils.h"
 #include "chrome/browser/ui/cocoa/chrome_event_processing_window.h"
 #include "chrome/grit/chromium_strings.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
@@ skipping 119 matching lines @@
 }
 
 - (void)showURL:(const GURL&)url {
   webContents_->GetController().LoadURL(url, content::Referrer(),
                                         ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
                                         std::string());
   [self show];
 }
 
 - (void)show {
+  // Because the User Manager isn't a BrowserWindowController, activating it
+  // will not trigger a -windowChangedToProfile and update the menu bar.
+  // This is only important if the active profile is Guest, which may have
+  // happened after locking a profile.
+  Profile* guestProfile = profiles::SetActiveProfileToGuestIfLocked();
+  if (guestProfile && guestProfile->IsGuestSession()) {
+    AppController* controller =
+        base::mac::ObjCCast<AppController>([NSApp delegate]);
+    [controller windowChangedToProfile:guestProfile];
+  }
   [[self window] makeKeyAndOrderFront:self];
 }
 
 - (void)close {
   [[self window] close];
 }
 
 -(BOOL)isVisible {
   return [[self window] isVisible];
 }
@@ skipping 49 matching lines @@
 void UserManagerMac::OnGuestProfileCreated(Profile* guest_profile,
                                            const std::string& url) {
   instance_ = new UserManagerMac(guest_profile);
   [instance_->window_controller_ showURL:GURL(url)];
 }
 
 void UserManagerMac::WindowWasClosed() {
   instance_ = NULL;
   delete this;
 }