OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #include "chrome/browser/signin/chrome_signin_helper.h" | 5 #include "chrome/browser/signin/chrome_signin_helper.h" |
6 | 6 |
7 #include "base/strings/string_util.h" | 7 #include "base/strings/string_util.h" |
8 #include "chrome/browser/prefs/incognito_mode_prefs.h" | 8 #include "chrome/browser/prefs/incognito_mode_prefs.h" |
9 #include "chrome/browser/profiles/profile_io_data.h" | 9 #include "chrome/browser/profiles/profile_io_data.h" |
10 #include "chrome/browser/signin/account_reconcilor_factory.h" | 10 #include "chrome/browser/signin/account_reconcilor_factory.h" |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
67 bubble_mode = BrowserWindow::AVATAR_BUBBLE_MODE_ADD_ACCOUNT; | 67 bubble_mode = BrowserWindow::AVATAR_BUBBLE_MODE_ADD_ACCOUNT; |
68 break; | 68 break; |
69 case GAIA_SERVICE_TYPE_REAUTH: | 69 case GAIA_SERVICE_TYPE_REAUTH: |
70 bubble_mode = BrowserWindow::AVATAR_BUBBLE_MODE_REAUTH; | 70 bubble_mode = BrowserWindow::AVATAR_BUBBLE_MODE_REAUTH; |
71 break; | 71 break; |
72 default: | 72 default: |
73 bubble_mode = BrowserWindow::AVATAR_BUBBLE_MODE_ACCOUNT_MANAGEMENT; | 73 bubble_mode = BrowserWindow::AVATAR_BUBBLE_MODE_ACCOUNT_MANAGEMENT; |
74 } | 74 } |
75 signin_metrics::LogAccountReconcilorStateOnGaiaResponse( | 75 signin_metrics::LogAccountReconcilorStateOnGaiaResponse( |
76 account_reconcilor->GetState()); | 76 account_reconcilor->GetState()); |
77 browser->window()->ShowAvatarBubbleFromAvatarButton(bubble_mode, | 77 browser->window()->ShowAvatarBubbleFromAvatarButton( |
78 manage_accounts_params); | 78 bubble_mode, manage_accounts_params, |
| 79 signin_metrics::AccessPoint::ACCESS_POINT_CONTENT_AREA); |
79 } | 80 } |
80 #else // BUILDFLAG(ANDROID_JAVA_UI) | 81 #else // BUILDFLAG(ANDROID_JAVA_UI) |
81 if (service_type == signin::GAIA_SERVICE_TYPE_INCOGNITO) { | 82 if (service_type == signin::GAIA_SERVICE_TYPE_INCOGNITO) { |
82 GURL url(manage_accounts_params.continue_url.empty() | 83 GURL url(manage_accounts_params.continue_url.empty() |
83 ? chrome::kChromeUINativeNewTabURL | 84 ? chrome::kChromeUINativeNewTabURL |
84 : manage_accounts_params.continue_url); | 85 : manage_accounts_params.continue_url); |
85 web_contents->OpenURL( | 86 web_contents->OpenURL( |
86 content::OpenURLParams(url, content::Referrer(), OFF_THE_RECORD, | 87 content::OpenURLParams(url, content::Referrer(), OFF_THE_RECORD, |
87 ui::PAGE_TRANSITION_AUTO_TOPLEVEL, false)); | 88 ui::PAGE_TRANSITION_AUTO_TOPLEVEL, false)); |
88 } else { | 89 } else { |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
161 return; | 162 return; |
162 | 163 |
163 params.child_id = child_id; | 164 params.child_id = child_id; |
164 params.route_id = route_id; | 165 params.route_id = route_id; |
165 content::BrowserThread::PostTask( | 166 content::BrowserThread::PostTask( |
166 content::BrowserThread::UI, FROM_HERE, | 167 content::BrowserThread::UI, FROM_HERE, |
167 base::Bind(ProcessMirrorHeaderUIThread, child_id, route_id, params)); | 168 base::Bind(ProcessMirrorHeaderUIThread, child_id, route_id, params)); |
168 } | 169 } |
169 | 170 |
170 } // namespace signin | 171 } // namespace signin |
OLD | NEW |