Fix accelerators in avatar gaia webview on mac

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_COCOA_PROFILES_PROFILE_CHOOSER_CONTROLLER_H_
 #define CHROME_BROWSER_UI_COCOA_PROFILES_PROFILE_CHOOSER_CONTROLLER_H_
 
 #import <Cocoa/Cocoa.h>
 #include <map>
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/profiles/profile_metrics.h"
 #include "chrome/browser/signin/signin_header_helper.h"
 #include "chrome/browser/ui/profile_chooser_constants.h"
 #import "chrome/browser/ui/cocoa/base_bubble_controller.h"
 
 class AvatarMenu;
 class ActiveProfileObserverBridge;
 class Browser;
 class ProfileOAuth2TokenService;
 
 namespace content {
 class WebContents;
 }
+class GaiaWebContentsDelegate;
 
 // This window controller manages the bubble that displays a "menu" of profiles.
 // It is brought open by clicking on the avatar icon in the window frame.
 @interface ProfileChooserController : BaseBubbleController<NSTextViewDelegate> {
  @private
   // The menu that contains the data from the backend.
   scoped_ptr<AvatarMenu> avatarMenu_;
 
   // An observer to be notified when the OAuth2 tokens change or the avatar
   // menu model updates for the active profile.
@@ skipping 13 matching lines @@
   // The current tutorial mode.
   profiles::TutorialMode tutorialMode_;
 
   // List of the full, un-elided accounts for the active profile. The keys are
   // generated used to tag the UI buttons, and the values are the original
   // emails displayed by the buttons.
   std::map<int, std::string> currentProfileAccounts_;
 
   // Web contents used by the inline signin view.
   scoped_ptr<content::WebContents> webContents_;
+  scoped_ptr<GaiaWebContentsDelegate> webContentsDelegate_;

[Alexei Svitkine (slow), 2014/10/28 18:27:23]

Does this need to be a scoped ptr, or can it just be a member?

[guohui, 2014/10/28 18:53:40]

By using the scoped pointer, we only instantiate webContentsDelegate_ when
needed, that is, when a user navigates to the gaia signin view.

 
   // Whether the bubble is displayed for an active guest profile.
   BOOL isGuestSession_;
 
   // The GAIA service type that caused this menu to open.
   signin::GAIAServiceType serviceType_;
 }
 
 - (id)initWithBrowser:(Browser*)browser
            anchoredAt:(NSPoint)point
@@ skipping 56 matching lines @@
 
 @interface ProfileChooserController (ExposedForTesting)
 - (id)initWithBrowser:(Browser*)browser
            anchoredAt:(NSPoint)point
              viewMode:(profiles::BubbleViewMode)viewMode
          tutorialMode:(profiles::TutorialMode)tutorialMode
           serviceType:(signin::GAIAServiceType)GAIAServiceType;
 @end
 
 #endif  // CHROME_BROWSER_UI_COCOA_PROFILES_PROFILE_CHOOSER_CONTROLLER_H_