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