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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
66 bubble_mode = BrowserWindow::AVATAR_BUBBLE_MODE_ADD_ACCOUNT; | 66 bubble_mode = BrowserWindow::AVATAR_BUBBLE_MODE_ADD_ACCOUNT; |
67 break; | 67 break; |
68 case GAIA_SERVICE_TYPE_REAUTH: | 68 case GAIA_SERVICE_TYPE_REAUTH: |
69 bubble_mode = BrowserWindow::AVATAR_BUBBLE_MODE_REAUTH; | 69 bubble_mode = BrowserWindow::AVATAR_BUBBLE_MODE_REAUTH; |
70 break; | 70 break; |
71 default: | 71 default: |
72 bubble_mode = BrowserWindow::AVATAR_BUBBLE_MODE_ACCOUNT_MANAGEMENT; | 72 bubble_mode = BrowserWindow::AVATAR_BUBBLE_MODE_ACCOUNT_MANAGEMENT; |
73 } | 73 } |
74 signin_metrics::LogAccountReconcilorStateOnGaiaResponse( | 74 signin_metrics::LogAccountReconcilorStateOnGaiaResponse( |
75 account_reconcilor->GetState()); | 75 account_reconcilor->GetState()); |
76 browser->window()->ShowAvatarBubbleFromAvatarButton(bubble_mode, | 76 browser->window()->ShowAvatarBubbleFromAvatarButton( |
77 manage_accounts_params); | 77 bubble_mode, manage_accounts_params, |
| 78 signin_metrics::AccessPoint::ACCESS_POINT_CONTENT_AREA); |
78 } | 79 } |
79 #else // defined(OS_ANDROID) | 80 #else // defined(OS_ANDROID) |
80 if (service_type == signin::GAIA_SERVICE_TYPE_INCOGNITO) { | 81 if (service_type == signin::GAIA_SERVICE_TYPE_INCOGNITO) { |
81 GURL url(manage_accounts_params.continue_url.empty() | 82 GURL url(manage_accounts_params.continue_url.empty() |
82 ? chrome::kChromeUINativeNewTabURL | 83 ? chrome::kChromeUINativeNewTabURL |
83 : manage_accounts_params.continue_url); | 84 : manage_accounts_params.continue_url); |
84 web_contents->OpenURL( | 85 web_contents->OpenURL( |
85 content::OpenURLParams(url, content::Referrer(), OFF_THE_RECORD, | 86 content::OpenURLParams(url, content::Referrer(), OFF_THE_RECORD, |
86 ui::PAGE_TRANSITION_AUTO_TOPLEVEL, false)); | 87 ui::PAGE_TRANSITION_AUTO_TOPLEVEL, false)); |
87 } else { | 88 } else { |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
160 return; | 161 return; |
161 | 162 |
162 params.child_id = child_id; | 163 params.child_id = child_id; |
163 params.route_id = route_id; | 164 params.route_id = route_id; |
164 content::BrowserThread::PostTask( | 165 content::BrowserThread::PostTask( |
165 content::BrowserThread::UI, FROM_HERE, | 166 content::BrowserThread::UI, FROM_HERE, |
166 base::Bind(ProcessMirrorHeaderUIThread, child_id, route_id, params)); | 167 base::Bind(ProcessMirrorHeaderUIThread, child_id, route_id, params)); |
167 } | 168 } |
168 | 169 |
169 } // namespace signin | 170 } // namespace signin |
OLD | NEW |