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 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
173 ProfileSyncService* service = | 173 ProfileSyncService* service = |
174 ProfileSyncServiceFactory::GetInstance()->GetForProfile( | 174 ProfileSyncServiceFactory::GetInstance()->GetForProfile( |
175 browser->profile()->GetOriginalProfile()); | 175 browser->profile()->GetOriginalProfile()); |
176 LoginUIService* login_service = LoginUIServiceFactory::GetForProfile( | 176 LoginUIService* login_service = LoginUIServiceFactory::GetForProfile( |
177 browser->profile()->GetOriginalProfile()); | 177 browser->profile()->GetOriginalProfile()); |
178 if (service->HasSyncSetupCompleted()) { | 178 if (service->HasSyncSetupCompleted()) { |
179 ShowSettings(browser); | 179 ShowSettings(browser); |
180 } else if (SyncPromoUI::ShouldShowSyncPromo(browser->profile()) && | 180 } else if (SyncPromoUI::ShouldShowSyncPromo(browser->profile()) && |
181 login_service->current_login_ui() == NULL) { | 181 login_service->current_login_ui() == NULL) { |
182 // There is no currently active login UI, so display a new promo page. | 182 // There is no currently active login UI, so display a new promo page. |
183 GURL url(SyncPromoUI::GetSyncPromoURL(GURL(), source)); | 183 GURL url(SyncPromoUI::GetSyncPromoURL(GURL(), source, false)); |
184 NavigateParams params(GetSingletonTabNavigateParams(browser, GURL(url))); | 184 NavigateParams params(GetSingletonTabNavigateParams(browser, GURL(url))); |
185 params.path_behavior = NavigateParams::IGNORE_AND_NAVIGATE; | 185 params.path_behavior = NavigateParams::IGNORE_AND_NAVIGATE; |
186 ShowSingletonTabOverwritingNTP(browser, params); | 186 ShowSingletonTabOverwritingNTP(browser, params); |
187 } else { | 187 } else { |
188 LoginUIServiceFactory::GetForProfile( | 188 LoginUIServiceFactory::GetForProfile( |
189 browser->profile()->GetOriginalProfile())->ShowLoginUI(browser); | 189 browser->profile()->GetOriginalProfile())->ShowLoginUI(browser); |
190 } | 190 } |
191 } | 191 } |
192 | 192 |
193 } // namespace chrome | 193 } // namespace chrome |
OLD | NEW |