| Index: chrome/browser/ui/cocoa/profiles/user_manager_mac.mm
|
| diff --git a/chrome/browser/ui/cocoa/profiles/user_manager_mac.mm b/chrome/browser/ui/cocoa/profiles/user_manager_mac.mm
|
| index 177a6df9f626e4d74a3aa3c6bb674ac1fdbedce4..efc5022ee984c24158c59cf223b8039b7df65e1a 100644
|
| --- a/chrome/browser/ui/cocoa/profiles/user_manager_mac.mm
|
| +++ b/chrome/browser/ui/cocoa/profiles/user_manager_mac.mm
|
| @@ -141,24 +141,35 @@ class UserManagerWebContentsDelegate : public content::WebContentsDelegate {
|
| }
|
| };
|
|
|
| -class ReauthDialogDelegate : public UserManager::ReauthDialogObserver,
|
| - public UserManagerWebContentsDelegate,
|
| +class ReauthDialogDelegate : public UserManager::BaseReauthDialogDelegate,
|
| public ConstrainedWindowMacDelegate {
|
| public:
|
| ReauthDialogDelegate(content::WebContents* web_contents,
|
| const std::string& email)
|
| - : UserManager::ReauthDialogObserver(web_contents, email) {}
|
| + : UserManager::BaseReauthDialogDelegate(web_contents) {
|
| + hotKeysWebContentsDelegate_.reset(new UserManagerWebContentsDelegate());
|
| + }
|
|
|
| - // UserManager::ReauthDialogObserver:
|
| + // UserManager::BaseReauthDialogDelegate:
|
| void CloseReauthDialog() override {
|
| CloseInstanceReauthDialog();
|
| }
|
|
|
| + // WebContentsDelegate::HandleKeyboardEvent:
|
| + void HandleKeyboardEvent(
|
| + content::WebContents* source,
|
| + const content::NativeWebKeyboardEvent& event) override {
|
| + hotKeysWebContentsDelegate_->HandleKeyboardEvent(source, event);
|
| + }
|
| +
|
| // ConstrainedWindowMacDelegate:
|
| void OnConstrainedWindowClosed(ConstrainedWindowMac* window) override {
|
| CloseReauthDialog();
|
| }
|
|
|
| +private:
|
| + std::unique_ptr<UserManagerWebContentsDelegate> hotKeysWebContentsDelegate_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(ReauthDialogDelegate);
|
| };
|
|
|
|
|