Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(258)

Side by Side Diff: chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm

Issue 1237123002: Revert of Regression: Overlay for "you' re now signed into chrome" remains open after clicking (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/views/profiles/profile_chooser_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1103 matching lines...) Expand 10 before | Expand all | Expand 10 after
1114 - (IBAction)showLearnMorePage:(id)sender { 1114 - (IBAction)showLearnMorePage:(id)sender {
1115 signin_ui_util::ShowSigninErrorLearnMorePage(browser_->profile()); 1115 signin_ui_util::ShowSigninErrorLearnMorePage(browser_->profile());
1116 } 1116 }
1117 1117
1118 - (IBAction)configureSyncSettings:(id)sender { 1118 - (IBAction)configureSyncSettings:(id)sender {
1119 tutorialMode_ = profiles::TUTORIAL_MODE_NONE; 1119 tutorialMode_ = profiles::TUTORIAL_MODE_NONE;
1120 LoginUIServiceFactory::GetForProfile(browser_->profile())-> 1120 LoginUIServiceFactory::GetForProfile(browser_->profile())->
1121 SyncConfirmationUIClosed(true); 1121 SyncConfirmationUIClosed(true);
1122 ProfileMetrics::LogProfileNewAvatarMenuSignin( 1122 ProfileMetrics::LogProfileNewAvatarMenuSignin(
1123 ProfileMetrics::PROFILE_AVATAR_MENU_SIGNIN_SETTINGS); 1123 ProfileMetrics::PROFILE_AVATAR_MENU_SIGNIN_SETTINGS);
1124 [self close];
1125 } 1124 }
1126 1125
1127 - (IBAction)syncSettingsConfirmed:(id)sender { 1126 - (IBAction)syncSettingsConfirmed:(id)sender {
1128 tutorialMode_ = profiles::TUTORIAL_MODE_NONE; 1127 tutorialMode_ = profiles::TUTORIAL_MODE_NONE;
1129 LoginUIServiceFactory::GetForProfile(browser_->profile())-> 1128 LoginUIServiceFactory::GetForProfile(browser_->profile())->
1130 SyncConfirmationUIClosed(false); 1129 SyncConfirmationUIClosed(false);
1131 ProfileMetrics::LogProfileNewAvatarMenuSignin( 1130 ProfileMetrics::LogProfileNewAvatarMenuSignin(
1132 ProfileMetrics::PROFILE_AVATAR_MENU_SIGNIN_OK); 1131 ProfileMetrics::PROFILE_AVATAR_MENU_SIGNIN_OK);
1133 [self initMenuContentsWithView:profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER]; 1132 [self initMenuContentsWithView:profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER];
1134 } 1133 }
(...skipping 1265 matching lines...) Expand 10 before | Expand all | Expand 10 after
2400 } 2399 }
2401 2400
2402 - (bool)shouldShowGoIncognito { 2401 - (bool)shouldShowGoIncognito {
2403 bool incognitoAvailable = 2402 bool incognitoAvailable =
2404 IncognitoModePrefs::GetAvailability(browser_->profile()->GetPrefs()) != 2403 IncognitoModePrefs::GetAvailability(browser_->profile()->GetPrefs()) !=
2405 IncognitoModePrefs::DISABLED; 2404 IncognitoModePrefs::DISABLED;
2406 return incognitoAvailable && !browser_->profile()->IsGuestSession(); 2405 return incognitoAvailable && !browser_->profile()->IsGuestSession();
2407 } 2406 }
2408 2407
2409 @end 2408 @end
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/profiles/profile_chooser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698