| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #import "chrome/browser/ui/cocoa/profiles/profile_chooser_controller.h" | 5 #import "chrome/browser/ui/cocoa/profiles/profile_chooser_controller.h" |
| 6 | 6 |
| 7 #import <Carbon/Carbon.h> // kVK_Return. | 7 #import <Carbon/Carbon.h> // kVK_Return. |
| 8 #import <Cocoa/Cocoa.h> | 8 #import <Cocoa/Cocoa.h> |
| 9 #include <stddef.h> | 9 #include <stddef.h> |
| 10 | 10 |
| (...skipping 1114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1125 [self initMenuContentsWithView:profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER]; | 1125 [self initMenuContentsWithView:profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER]; |
| 1126 } | 1126 } |
| 1127 | 1127 |
| 1128 - (IBAction)lockProfile:(id)sender { | 1128 - (IBAction)lockProfile:(id)sender { |
| 1129 profiles::LockProfile(browser_->profile()); | 1129 profiles::LockProfile(browser_->profile()); |
| 1130 [self postActionPerformed:ProfileMetrics::PROFILE_DESKTOP_MENU_LOCK]; | 1130 [self postActionPerformed:ProfileMetrics::PROFILE_DESKTOP_MENU_LOCK]; |
| 1131 } | 1131 } |
| 1132 | 1132 |
| 1133 - (void)showSigninUIForMode:(profiles::BubbleViewMode)mode { | 1133 - (void)showSigninUIForMode:(profiles::BubbleViewMode)mode { |
| 1134 if (SigninViewController::ShouldShowModalSigninForMode(mode)) { | 1134 if (SigninViewController::ShouldShowModalSigninForMode(mode)) { |
| 1135 browser_->ShowModalSigninWindow(mode, accessPoint_); | 1135 browser_->signin_view_controller()->ShowModalSignin(mode, browser_, |
| 1136 accessPoint_); |
| 1136 } else { | 1137 } else { |
| 1137 [self initMenuContentsWithView:mode]; | 1138 [self initMenuContentsWithView:mode]; |
| 1138 } | 1139 } |
| 1139 } | 1140 } |
| 1140 | 1141 |
| 1141 - (IBAction)showInlineSigninPage:(id)sender { | 1142 - (IBAction)showInlineSigninPage:(id)sender { |
| 1142 [self showSigninUIForMode:profiles::BUBBLE_VIEW_MODE_GAIA_SIGNIN]; | 1143 [self showSigninUIForMode:profiles::BUBBLE_VIEW_MODE_GAIA_SIGNIN]; |
| 1143 } | 1144 } |
| 1144 | 1145 |
| 1145 - (IBAction)addAccount:(id)sender { | 1146 - (IBAction)addAccount:(id)sender { |
| (...skipping 1499 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2645 | 2646 |
| 2646 - (void)showWindow:(id)sender { | 2647 - (void)showWindow:(id)sender { |
| 2647 [super showWindow:sender]; | 2648 [super showWindow:sender]; |
| 2648 NSEvent *event = [[NSApplication sharedApplication] currentEvent]; | 2649 NSEvent *event = [[NSApplication sharedApplication] currentEvent]; |
| 2649 if (firstProfileView_ && [event type] == NSKeyDown) { | 2650 if (firstProfileView_ && [event type] == NSKeyDown) { |
| 2650 [[self window] makeFirstResponder:firstProfileView_]; | 2651 [[self window] makeFirstResponder:firstProfileView_]; |
| 2651 } | 2652 } |
| 2652 } | 2653 } |
| 2653 | 2654 |
| 2654 @end | 2655 @end |
| OLD | NEW |