| 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/chrome_browser_main.h" | 5 #include "chrome/browser/chrome_browser_main.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 1647 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1658 base::TimeDelta delay = base::TimeTicks::Now() - browser_open_start; | 1658 base::TimeDelta delay = base::TimeTicks::Now() - browser_open_start; |
| 1659 UMA_HISTOGRAM_LONG_TIMES_100("Startup.BrowserOpenTabs", delay); | 1659 UMA_HISTOGRAM_LONG_TIMES_100("Startup.BrowserOpenTabs", delay); |
| 1660 | 1660 |
| 1661 // If we're running tests (ui_task is non-null), then we don't want to | 1661 // If we're running tests (ui_task is non-null), then we don't want to |
| 1662 // call RequestLanguageList or StartRepeatedVariationsSeedFetch or | 1662 // call RequestLanguageList or StartRepeatedVariationsSeedFetch or |
| 1663 // RequestLanguageList | 1663 // RequestLanguageList |
| 1664 if (parameters().ui_task == NULL) { | 1664 if (parameters().ui_task == NULL) { |
| 1665 // Request new variations seed information from server. | 1665 // Request new variations seed information from server. |
| 1666 chrome_variations::VariationsService* variations_service = | 1666 chrome_variations::VariationsService* variations_service = |
| 1667 browser_process_->variations_service(); | 1667 browser_process_->variations_service(); |
| 1668 if (variations_service) { | 1668 if (variations_service) |
| 1669 variations_service->StartRepeatedVariationsSeedFetch(); | 1669 variations_service->PerformPreMainMessageLoopStartup(); |
| 1670 | |
| 1671 #if defined(OS_WIN) | |
| 1672 variations_service->StartGoogleUpdateRegistrySync(); | |
| 1673 #endif // defined(OS_WIN) | |
| 1674 } | |
| 1675 | 1670 |
| 1676 translate::TranslateDownloadManager::RequestLanguageList( | 1671 translate::TranslateDownloadManager::RequestLanguageList( |
| 1677 profile_->GetPrefs()); | 1672 profile_->GetPrefs()); |
| 1678 } | 1673 } |
| 1679 | 1674 |
| 1680 run_message_loop_ = true; | 1675 run_message_loop_ = true; |
| 1681 } else { | 1676 } else { |
| 1682 run_message_loop_ = false; | 1677 run_message_loop_ = false; |
| 1683 } | 1678 } |
| 1684 browser_creator_.reset(); | 1679 browser_creator_.reset(); |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1816 chromeos::CrosSettings::Shutdown(); | 1811 chromeos::CrosSettings::Shutdown(); |
| 1817 #endif // defined(OS_CHROMEOS) | 1812 #endif // defined(OS_CHROMEOS) |
| 1818 #endif // defined(OS_ANDROID) | 1813 #endif // defined(OS_ANDROID) |
| 1819 } | 1814 } |
| 1820 | 1815 |
| 1821 // Public members: | 1816 // Public members: |
| 1822 | 1817 |
| 1823 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1818 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 1824 chrome_extra_parts_.push_back(parts); | 1819 chrome_extra_parts_.push_back(parts); |
| 1825 } | 1820 } |
| OLD | NEW |