| 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 #if defined(TOOLKIT_GTK) | 7 #if defined(TOOLKIT_GTK) |
| 8 #include <gtk/gtk.h> | 8 #include <gtk/gtk.h> |
| 9 #endif | 9 #endif |
| 10 | 10 |
| (...skipping 1531 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1542 chrome_variations::VariationsService* variations_service = | 1542 chrome_variations::VariationsService* variations_service = |
| 1543 browser_process_->variations_service(); | 1543 browser_process_->variations_service(); |
| 1544 if (variations_service) { | 1544 if (variations_service) { |
| 1545 variations_service->StartRepeatedVariationsSeedFetch(); | 1545 variations_service->StartRepeatedVariationsSeedFetch(); |
| 1546 | 1546 |
| 1547 #if defined(OS_WIN) | 1547 #if defined(OS_WIN) |
| 1548 variations_service->StartGoogleUpdateRegistrySync(); | 1548 variations_service->StartGoogleUpdateRegistrySync(); |
| 1549 #endif | 1549 #endif |
| 1550 } | 1550 } |
| 1551 | 1551 |
| 1552 #if !defined(OS_CHROMEOS) | |
| 1553 // TODO(mad): Move this call in a proper place on CrOS. | |
| 1554 // http://crosbug.com/17687 | |
| 1555 if (translate_manager_ != NULL) { | 1552 if (translate_manager_ != NULL) { |
| 1556 translate_manager_->FetchLanguageListFromTranslateServer( | 1553 translate_manager_->FetchLanguageListFromTranslateServer( |
| 1557 profile_->GetPrefs()); | 1554 profile_->GetPrefs()); |
| 1558 } | 1555 } |
| 1559 #endif | |
| 1560 } | 1556 } |
| 1561 | 1557 |
| 1562 run_message_loop_ = true; | 1558 run_message_loop_ = true; |
| 1563 } else { | 1559 } else { |
| 1564 run_message_loop_ = false; | 1560 run_message_loop_ = false; |
| 1565 } | 1561 } |
| 1566 browser_creator_.reset(); | 1562 browser_creator_.reset(); |
| 1567 #endif // !defined(OS_ANDROID) | 1563 #endif // !defined(OS_ANDROID) |
| 1568 | 1564 |
| 1569 PostBrowserStart(); | 1565 PostBrowserStart(); |
| (...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1768 if (base::win::GetVersion() <= base::win::VERSION_XP) | 1764 if (base::win::GetVersion() <= base::win::VERSION_XP) |
| 1769 uma_name += "_XP"; | 1765 uma_name += "_XP"; |
| 1770 | 1766 |
| 1771 uma_name += "_PreRead_"; | 1767 uma_name += "_PreRead_"; |
| 1772 uma_name += pre_read_percentage; | 1768 uma_name += pre_read_percentage; |
| 1773 AddPreReadHistogramTime(uma_name.c_str(), time); | 1769 AddPreReadHistogramTime(uma_name.c_str(), time); |
| 1774 } | 1770 } |
| 1775 #endif | 1771 #endif |
| 1776 #endif | 1772 #endif |
| 1777 } | 1773 } |
| OLD | NEW |