| 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 1485 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1496 // data source is based on the Component Updater. | 1496 // data source is based on the Component Updater. |
| 1497 translate::BrowserCldUtils::ConfigureDefaultDataProvider(); | 1497 translate::BrowserCldUtils::ConfigureDefaultDataProvider(); |
| 1498 | 1498 |
| 1499 if (!parsed_command_line().HasSwitch(switches::kDisableComponentUpdate)) | 1499 if (!parsed_command_line().HasSwitch(switches::kDisableComponentUpdate)) |
| 1500 RegisterComponentsForUpdate(); | 1500 RegisterComponentsForUpdate(); |
| 1501 | 1501 |
| 1502 #if defined(OS_ANDROID) | 1502 #if defined(OS_ANDROID) |
| 1503 chrome_variations::VariationsService* variations_service = | 1503 chrome_variations::VariationsService* variations_service = |
| 1504 browser_process_->variations_service(); | 1504 browser_process_->variations_service(); |
| 1505 if (variations_service) { | 1505 if (variations_service) { |
| 1506 // Just initialize the policy prefs service here. Variations seed fetching |
| 1507 // will be initialized when the app enters foreground mode. |
| 1506 variations_service->set_policy_pref_service(profile_->GetPrefs()); | 1508 variations_service->set_policy_pref_service(profile_->GetPrefs()); |
| 1507 variations_service->StartRepeatedVariationsSeedFetch(); | |
| 1508 } | 1509 } |
| 1509 translate::TranslateDownloadManager::RequestLanguageList( | 1510 translate::TranslateDownloadManager::RequestLanguageList( |
| 1510 profile_->GetPrefs()); | 1511 profile_->GetPrefs()); |
| 1511 | 1512 |
| 1512 #else | 1513 #else |
| 1513 // Most general initialization is behind us, but opening a | 1514 // Most general initialization is behind us, but opening a |
| 1514 // tab and/or session restore and such is still to be done. | 1515 // tab and/or session restore and such is still to be done. |
| 1515 base::TimeTicks browser_open_start = base::TimeTicks::Now(); | 1516 base::TimeTicks browser_open_start = base::TimeTicks::Now(); |
| 1516 | 1517 |
| 1517 // We are in regular browser boot sequence. Open initial tabs and enter the | 1518 // We are in regular browser boot sequence. Open initial tabs and enter the |
| (...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1710 chromeos::CrosSettings::Shutdown(); | 1711 chromeos::CrosSettings::Shutdown(); |
| 1711 #endif | 1712 #endif |
| 1712 #endif | 1713 #endif |
| 1713 } | 1714 } |
| 1714 | 1715 |
| 1715 // Public members: | 1716 // Public members: |
| 1716 | 1717 |
| 1717 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1718 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 1718 chrome_extra_parts_.push_back(parts); | 1719 chrome_extra_parts_.push_back(parts); |
| 1719 } | 1720 } |
| OLD | NEW |