| 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/signin_header_helper.h" | 5 #include "chrome/browser/signin/signin_header_helper.h" |
| 6 | 6 |
| 7 #include "base/strings/string_number_conversions.h" | 7 #include "base/strings/string_number_conversions.h" |
| 8 #include "base/strings/stringprintf.h" | 8 #include "base/strings/stringprintf.h" |
| 9 #include "chrome/browser/google/google_util.h" | 9 #include "chrome/browser/google/google_util.h" |
| 10 #include "chrome/browser/prefs/incognito_mode_prefs.h" | 10 #include "chrome/browser/prefs/incognito_mode_prefs.h" |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 BrowserWindow::AVATAR_BUBBLE_MODE_ACCOUNT_MANAGEMENT, | 76 BrowserWindow::AVATAR_BUBBLE_MODE_ACCOUNT_MANAGEMENT, |
| 77 service_type); | 77 service_type); |
| 78 } | 78 } |
| 79 } | 79 } |
| 80 #else // defined(OS_ANDROID) | 80 #else // defined(OS_ANDROID) |
| 81 if (service_type == signin::GAIA_SERVICE_TYPE_SIGNOUTOPTIONS_INCOGNITO) { | 81 if (service_type == signin::GAIA_SERVICE_TYPE_SIGNOUTOPTIONS_INCOGNITO) { |
| 82 web_contents->OpenURL(content::OpenURLParams( | 82 web_contents->OpenURL(content::OpenURLParams( |
| 83 GURL(chrome::kChromeUINativeNewTabURL), content::Referrer(), | 83 GURL(chrome::kChromeUINativeNewTabURL), content::Referrer(), |
| 84 OFF_THE_RECORD, content::PAGE_TRANSITION_AUTO_TOPLEVEL, false)); | 84 OFF_THE_RECORD, content::PAGE_TRANSITION_AUTO_TOPLEVEL, false)); |
| 85 } else { | 85 } else { |
| 86 // TODO(mlerman): pass service_type to android logic for UMA metrics | |
| 87 // that will eventually be installed there. | |
| 88 AccountManagementScreenHelper::OpenAccountManagementScreen( | 86 AccountManagementScreenHelper::OpenAccountManagementScreen( |
| 89 Profile::FromBrowserContext(web_contents->GetBrowserContext())); | 87 Profile::FromBrowserContext(web_contents->GetBrowserContext()), |
| 88 service_type); |
| 90 } | 89 } |
| 91 #endif // OS_ANDROID | 90 #endif // OS_ANDROID |
| 92 } | 91 } |
| 93 | 92 |
| 94 bool IsDriveOrigin(const GURL& url) { | 93 bool IsDriveOrigin(const GURL& url) { |
| 95 if (!url.SchemeIsSecure()) | 94 if (!url.SchemeIsSecure()) |
| 96 return false; | 95 return false; |
| 97 | 96 |
| 98 const GURL kGoogleDriveURL("https://drive.google.com"); | 97 const GURL kGoogleDriveURL("https://drive.google.com"); |
| 99 const GURL kGoogleDocsURL("https://docs.google.com"); | 98 const GURL kGoogleDocsURL("https://docs.google.com"); |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 170 DCHECK(switches::IsNewProfileManagement() && | 169 DCHECK(switches::IsNewProfileManagement() && |
| 171 !io_data->IsOffTheRecord()); | 170 !io_data->IsOffTheRecord()); |
| 172 content::BrowserThread::PostTask( | 171 content::BrowserThread::PostTask( |
| 173 content::BrowserThread::UI, FROM_HERE, | 172 content::BrowserThread::UI, FROM_HERE, |
| 174 base::Bind(ProcessMirrorHeaderUIThread, child_id, route_id, | 173 base::Bind(ProcessMirrorHeaderUIThread, child_id, route_id, |
| 175 header_value)); | 174 header_value)); |
| 176 } | 175 } |
| 177 } | 176 } |
| 178 | 177 |
| 179 } // namespace signin | 178 } // namespace signin |
| OLD | NEW |