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 <Cocoa/Cocoa.h> | 5 #import <Cocoa/Cocoa.h> |
6 #import <Carbon/Carbon.h> // kVK_Return. | 6 #import <Carbon/Carbon.h> // kVK_Return. |
7 | 7 |
8 #import "chrome/browser/ui/cocoa/profiles/profile_chooser_controller.h" | 8 #import "chrome/browser/ui/cocoa/profiles/profile_chooser_controller.h" |
9 | 9 |
10 #include "base/mac/bundle_locations.h" | 10 #include "base/mac/bundle_locations.h" |
(...skipping 1978 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1989 break; | 1989 break; |
1990 case profiles::BUBBLE_VIEW_MODE_GAIA_ADD_ACCOUNT: | 1990 case profiles::BUBBLE_VIEW_MODE_GAIA_ADD_ACCOUNT: |
1991 url = signin::GetPromoURL( | 1991 url = signin::GetPromoURL( |
1992 signin_metrics::SOURCE_AVATAR_BUBBLE_ADD_ACCOUNT, | 1992 signin_metrics::SOURCE_AVATAR_BUBBLE_ADD_ACCOUNT, |
1993 false /* auto_close */, | 1993 false /* auto_close */, |
1994 true /* is_constrained */); | 1994 true /* is_constrained */); |
1995 messageId = IDS_PROFILES_GAIA_ADD_ACCOUNT_TITLE; | 1995 messageId = IDS_PROFILES_GAIA_ADD_ACCOUNT_TITLE; |
1996 break; | 1996 break; |
1997 case profiles::BUBBLE_VIEW_MODE_GAIA_REAUTH: | 1997 case profiles::BUBBLE_VIEW_MODE_GAIA_REAUTH: |
1998 DCHECK(HasAuthError(browser_->profile())); | 1998 DCHECK(HasAuthError(browser_->profile())); |
1999 errorController = profiles::GetSigninErrorController(browser_->profile()); | 1999 errorController = profiles::GetSigninErrorController(browser_->profile()); |
Mike Lerman
2015/04/24 19:36:26
Would you be okay changing this to referencing the
Roger Tawa OOO till Jul 10th
2015/04/27 20:31:59
Done.
| |
2000 url = signin::GetReauthURL( | 2000 url = signin::GetReauthURL( |
2001 browser_->profile(), | 2001 browser_->profile(), |
2002 errorController ? errorController->error_username() : std::string()); | 2002 errorController ? errorController->error_account_id() |
2003 : std::string()); | |
2003 messageId = IDS_PROFILES_GAIA_REAUTH_TITLE; | 2004 messageId = IDS_PROFILES_GAIA_REAUTH_TITLE; |
2004 break; | 2005 break; |
2005 default: | 2006 default: |
2006 NOTREACHED() << "Called with invalid mode=" << viewMode_; | 2007 NOTREACHED() << "Called with invalid mode=" << viewMode_; |
2007 break; | 2008 break; |
2008 } | 2009 } |
2009 | 2010 |
2010 webContents_.reset(content::WebContents::Create( | 2011 webContents_.reset(content::WebContents::Create( |
2011 content::WebContents::CreateParams(browser_->profile()))); | 2012 content::WebContents::CreateParams(browser_->profile()))); |
2012 | 2013 |
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2311 } | 2312 } |
2312 | 2313 |
2313 - (bool)shouldShowGoIncognito { | 2314 - (bool)shouldShowGoIncognito { |
2314 bool incognitoAvailable = | 2315 bool incognitoAvailable = |
2315 IncognitoModePrefs::GetAvailability(browser_->profile()->GetPrefs()) != | 2316 IncognitoModePrefs::GetAvailability(browser_->profile()->GetPrefs()) != |
2316 IncognitoModePrefs::DISABLED; | 2317 IncognitoModePrefs::DISABLED; |
2317 return incognitoAvailable && !browser_->profile()->IsGuestSession(); | 2318 return incognitoAvailable && !browser_->profile()->IsGuestSession(); |
2318 } | 2319 } |
2319 | 2320 |
2320 @end | 2321 @end |
OLD | NEW |