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 "build/build_config.h" | 8 #include "build/build_config.h" |
9 #include "chrome/browser/prefs/incognito_mode_prefs.h" | 9 #include "chrome/browser/prefs/incognito_mode_prefs.h" |
10 #include "chrome/browser/profiles/profile_io_data.h" | 10 #include "chrome/browser/profiles/profile_io_data.h" |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
77 account_reconcilor->GetState()); | 77 account_reconcilor->GetState()); |
78 browser->window()->ShowAvatarBubbleFromAvatarButton( | 78 browser->window()->ShowAvatarBubbleFromAvatarButton( |
79 bubble_mode, manage_accounts_params, | 79 bubble_mode, manage_accounts_params, |
80 signin_metrics::AccessPoint::ACCESS_POINT_CONTENT_AREA); | 80 signin_metrics::AccessPoint::ACCESS_POINT_CONTENT_AREA); |
81 } | 81 } |
82 #else // BUILDFLAG(ANDROID_JAVA_UI) | 82 #else // BUILDFLAG(ANDROID_JAVA_UI) |
83 if (service_type == signin::GAIA_SERVICE_TYPE_INCOGNITO) { | 83 if (service_type == signin::GAIA_SERVICE_TYPE_INCOGNITO) { |
84 GURL url(manage_accounts_params.continue_url.empty() | 84 GURL url(manage_accounts_params.continue_url.empty() |
85 ? chrome::kChromeUINativeNewTabURL | 85 ? chrome::kChromeUINativeNewTabURL |
86 : manage_accounts_params.continue_url); | 86 : manage_accounts_params.continue_url); |
87 web_contents->OpenURL( | 87 web_contents->OpenURL(content::OpenURLParams( |
88 content::OpenURLParams(url, content::Referrer(), OFF_THE_RECORD, | 88 url, content::Referrer(), WindowOpenDisposition::OFF_THE_RECORD, |
89 ui::PAGE_TRANSITION_AUTO_TOPLEVEL, false)); | 89 ui::PAGE_TRANSITION_AUTO_TOPLEVEL, false)); |
90 } else { | 90 } else { |
91 signin_metrics::LogAccountReconcilorStateOnGaiaResponse( | 91 signin_metrics::LogAccountReconcilorStateOnGaiaResponse( |
92 account_reconcilor->GetState()); | 92 account_reconcilor->GetState()); |
93 AccountManagementScreenHelper::OpenAccountManagementScreen(profile, | 93 AccountManagementScreenHelper::OpenAccountManagementScreen(profile, |
94 service_type); | 94 service_type); |
95 } | 95 } |
96 #endif // !BUILDFLAG(ANDROID_JAVA_UI) | 96 #endif // !BUILDFLAG(ANDROID_JAVA_UI) |
97 } | 97 } |
98 | 98 |
99 // Returns the parameters contained in the X-Chrome-Manage-Accounts response | 99 // Returns the parameters contained in the X-Chrome-Manage-Accounts response |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
163 return; | 163 return; |
164 | 164 |
165 params.child_id = child_id; | 165 params.child_id = child_id; |
166 params.route_id = route_id; | 166 params.route_id = route_id; |
167 content::BrowserThread::PostTask( | 167 content::BrowserThread::PostTask( |
168 content::BrowserThread::UI, FROM_HERE, | 168 content::BrowserThread::UI, FROM_HERE, |
169 base::Bind(ProcessMirrorHeaderUIThread, child_id, route_id, params)); | 169 base::Bind(ProcessMirrorHeaderUIThread, child_id, route_id, params)); |
170 } | 170 } |
171 | 171 |
172 } // namespace signin | 172 } // namespace signin |
OLD | NEW |