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 | 9 |
10 #include "base/mac/bundle_locations.h" | 10 #include "base/mac/bundle_locations.h" |
(...skipping 1178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1189 | 1189 |
1190 - (void)cleanUpEmbeddedViewContents { | 1190 - (void)cleanUpEmbeddedViewContents { |
1191 webContents_.reset(); | 1191 webContents_.reset(); |
1192 webContentsDelegate_.reset(); | 1192 webContentsDelegate_.reset(); |
1193 } | 1193 } |
1194 | 1194 |
1195 - (id)initWithBrowser:(Browser*)browser | 1195 - (id)initWithBrowser:(Browser*)browser |
1196 anchoredAt:(NSPoint)point | 1196 anchoredAt:(NSPoint)point |
1197 viewMode:(profiles::BubbleViewMode)viewMode | 1197 viewMode:(profiles::BubbleViewMode)viewMode |
1198 tutorialMode:(profiles::TutorialMode)tutorialMode | 1198 tutorialMode:(profiles::TutorialMode)tutorialMode |
1199 serviceType:(signin::GAIAServiceType)serviceType { | 1199 serviceType:(signin::GAIAServiceType)serviceType |
| 1200 accessPoint:(signin_metrics::AccessPoint)accessPoint { |
1200 base::scoped_nsobject<InfoBubbleWindow> window([[InfoBubbleWindow alloc] | 1201 base::scoped_nsobject<InfoBubbleWindow> window([[InfoBubbleWindow alloc] |
1201 initWithContentRect:ui::kWindowSizeDeterminedLater | 1202 initWithContentRect:ui::kWindowSizeDeterminedLater |
1202 styleMask:NSBorderlessWindowMask | 1203 styleMask:NSBorderlessWindowMask |
1203 backing:NSBackingStoreBuffered | 1204 backing:NSBackingStoreBuffered |
1204 defer:NO]); | 1205 defer:NO]); |
1205 | 1206 |
1206 if ((self = [super initWithWindow:window | 1207 if ((self = [super initWithWindow:window |
1207 parentWindow:browser->window()->GetNativeWindow() | 1208 parentWindow:browser->window()->GetNativeWindow() |
1208 anchoredAt:point])) { | 1209 anchoredAt:point])) { |
1209 browser_ = browser; | 1210 browser_ = browser; |
1210 viewMode_ = viewMode; | 1211 viewMode_ = viewMode; |
1211 tutorialMode_ = tutorialMode; | 1212 tutorialMode_ = tutorialMode; |
1212 observer_.reset(new ActiveProfileObserverBridge(self, browser_)); | 1213 observer_.reset(new ActiveProfileObserverBridge(self, browser_)); |
1213 serviceType_ = serviceType; | 1214 serviceType_ = serviceType; |
| 1215 accessPoint_ = accessPoint; |
1214 | 1216 |
1215 avatarMenu_.reset(new AvatarMenu( | 1217 avatarMenu_.reset(new AvatarMenu( |
1216 &g_browser_process->profile_manager()->GetProfileInfoCache(), | 1218 &g_browser_process->profile_manager()->GetProfileInfoCache(), |
1217 observer_.get(), | 1219 observer_.get(), |
1218 browser_)); | 1220 browser_)); |
1219 avatarMenu_->RebuildMenu(); | 1221 avatarMenu_->RebuildMenu(); |
1220 | 1222 |
1221 // Guest profiles do not have a token service. | 1223 // Guest profiles do not have a token service. |
1222 isGuestSession_ = browser_->profile()->IsGuestSession(); | 1224 isGuestSession_ = browser_->profile()->IsGuestSession(); |
1223 | 1225 |
(...skipping 847 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2071 | 2073 |
2072 - (NSView*)buildGaiaEmbeddedView { | 2074 - (NSView*)buildGaiaEmbeddedView { |
2073 base::scoped_nsobject<NSView> container( | 2075 base::scoped_nsobject<NSView> container( |
2074 [[NSView alloc] initWithFrame:NSZeroRect]); | 2076 [[NSView alloc] initWithFrame:NSZeroRect]); |
2075 CGFloat yOffset = 0; | 2077 CGFloat yOffset = 0; |
2076 | 2078 |
2077 GURL url; | 2079 GURL url; |
2078 int messageId = -1; | 2080 int messageId = -1; |
2079 switch (viewMode_) { | 2081 switch (viewMode_) { |
2080 case profiles::BUBBLE_VIEW_MODE_GAIA_SIGNIN: | 2082 case profiles::BUBBLE_VIEW_MODE_GAIA_SIGNIN: |
2081 url = signin::GetPromoURL(signin_metrics::SOURCE_AVATAR_BUBBLE_SIGN_IN, | 2083 url = signin::GetPromoURL( |
2082 false /* auto_close */, | 2084 accessPoint_, signin_metrics::REASON_SIGNIN_PRIMARY_ACCOUNT, |
2083 true /* is_constrained */); | 2085 false /* auto_close */, true /* is_constrained */); |
2084 messageId = IDS_PROFILES_GAIA_SIGNIN_TITLE; | 2086 messageId = IDS_PROFILES_GAIA_SIGNIN_TITLE; |
2085 break; | 2087 break; |
2086 case profiles::BUBBLE_VIEW_MODE_GAIA_ADD_ACCOUNT: | 2088 case profiles::BUBBLE_VIEW_MODE_GAIA_ADD_ACCOUNT: |
2087 url = signin::GetPromoURL( | 2089 url = signin::GetPromoURL( |
2088 signin_metrics::SOURCE_AVATAR_BUBBLE_ADD_ACCOUNT, | 2090 accessPoint_, signin_metrics::REASON_ADD_SECONDARY_ACCOUNT, |
2089 false /* auto_close */, | 2091 false /* auto_close */, true /* is_constrained */); |
2090 true /* is_constrained */); | |
2091 messageId = IDS_PROFILES_GAIA_ADD_ACCOUNT_TITLE; | 2092 messageId = IDS_PROFILES_GAIA_ADD_ACCOUNT_TITLE; |
2092 break; | 2093 break; |
2093 case profiles::BUBBLE_VIEW_MODE_GAIA_REAUTH: | 2094 case profiles::BUBBLE_VIEW_MODE_GAIA_REAUTH: |
2094 DCHECK(HasAuthError(browser_->profile())); | 2095 DCHECK(HasAuthError(browser_->profile())); |
2095 url = signin::GetReauthURL( | 2096 url = signin::GetReauthURL( |
| 2097 accessPoint_, signin_metrics::REASON_REAUTHENTICATION, |
2096 browser_->profile(), GetAuthErrorAccountId(browser_->profile())); | 2098 browser_->profile(), GetAuthErrorAccountId(browser_->profile())); |
2097 messageId = IDS_PROFILES_GAIA_REAUTH_TITLE; | 2099 messageId = IDS_PROFILES_GAIA_REAUTH_TITLE; |
2098 break; | 2100 break; |
2099 default: | 2101 default: |
2100 NOTREACHED() << "Called with invalid mode=" << viewMode_; | 2102 NOTREACHED() << "Called with invalid mode=" << viewMode_; |
2101 break; | 2103 break; |
2102 } | 2104 } |
2103 | 2105 |
2104 webContents_.reset(content::WebContents::Create( | 2106 webContents_.reset(content::WebContents::Create( |
2105 content::WebContents::CreateParams(browser_->profile()))); | 2107 content::WebContents::CreateParams(browser_->profile()))); |
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2405 } | 2407 } |
2406 | 2408 |
2407 - (bool)shouldShowGoIncognito { | 2409 - (bool)shouldShowGoIncognito { |
2408 bool incognitoAvailable = | 2410 bool incognitoAvailable = |
2409 IncognitoModePrefs::GetAvailability(browser_->profile()->GetPrefs()) != | 2411 IncognitoModePrefs::GetAvailability(browser_->profile()->GetPrefs()) != |
2410 IncognitoModePrefs::DISABLED; | 2412 IncognitoModePrefs::DISABLED; |
2411 return incognitoAvailable && !browser_->profile()->IsGuestSession(); | 2413 return incognitoAvailable && !browser_->profile()->IsGuestSession(); |
2412 } | 2414 } |
2413 | 2415 |
2414 @end | 2416 @end |
OLD | NEW |