| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/ui/chrome_pages.h" | 5 #include "chrome/browser/ui/chrome_pages.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/string_number_conversions.h" | 8 #include "base/string_number_conversions.h" |
| 9 #include "base/stringprintf.h" | 9 #include "base/stringprintf.h" |
| 10 #include "chrome/browser/download/download_shelf.h" | 10 #include "chrome/browser/download/download_shelf.h" |
| (...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 186 } else if (SyncPromoUI::ShouldShowSyncPromo(browser->profile()) && | 186 } else if (SyncPromoUI::ShouldShowSyncPromo(browser->profile()) && |
| 187 login_service->current_login_ui() == NULL) { | 187 login_service->current_login_ui() == NULL) { |
| 188 // There is no currently active login UI, so display a new promo page. | 188 // There is no currently active login UI, so display a new promo page. |
| 189 GURL url(SyncPromoUI::GetSyncPromoURL(GURL(), source)); | 189 GURL url(SyncPromoUI::GetSyncPromoURL(GURL(), source)); |
| 190 browser::NavigateParams params( | 190 browser::NavigateParams params( |
| 191 GetSingletonTabNavigateParams(browser, GURL(url))); | 191 GetSingletonTabNavigateParams(browser, GURL(url))); |
| 192 params.path_behavior = browser::NavigateParams::IGNORE_AND_NAVIGATE; | 192 params.path_behavior = browser::NavigateParams::IGNORE_AND_NAVIGATE; |
| 193 ShowSingletonTabOverwritingNTP(browser, params); | 193 ShowSingletonTabOverwritingNTP(browser, params); |
| 194 } else { | 194 } else { |
| 195 LoginUIServiceFactory::GetForProfile( | 195 LoginUIServiceFactory::GetForProfile( |
| 196 browser->profile()->GetOriginalProfile())->ShowLoginUI(); | 196 browser->profile()->GetOriginalProfile())->ShowLoginUI(browser); |
| 197 } | 197 } |
| 198 } | 198 } |
| 199 | 199 |
| 200 } // namespace chrome | 200 } // namespace chrome |
| OLD | NEW |