| 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 <algorithm> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 1384 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1395 #if defined(OS_MACOSX) | 1395 #if defined(OS_MACOSX) |
| 1396 // Call Recycle() here as late as possible, before going into the loop | 1396 // Call Recycle() here as late as possible, before going into the loop |
| 1397 // because Start() will add things to it while creating the main window. | 1397 // because Start() will add things to it while creating the main window. |
| 1398 if (parameters().autorelease_pool) | 1398 if (parameters().autorelease_pool) |
| 1399 parameters().autorelease_pool->Recycle(); | 1399 parameters().autorelease_pool->Recycle(); |
| 1400 #endif | 1400 #endif |
| 1401 | 1401 |
| 1402 RecordPreReadExperimentTime("Startup.BrowserOpenTabs", | 1402 RecordPreReadExperimentTime("Startup.BrowserOpenTabs", |
| 1403 base::TimeTicks::Now() - browser_open_start); | 1403 base::TimeTicks::Now() - browser_open_start); |
| 1404 | 1404 |
| 1405 // TODO(mad): Move this call in a proper place on CrOS. | |
| 1406 // http://crosbug.com/17687 | |
| 1407 #if !defined(OS_CHROMEOS) | |
| 1408 // If we're running tests (ui_task is non-null), then we don't want to | 1405 // If we're running tests (ui_task is non-null), then we don't want to |
| 1409 // call FetchLanguageListFromTranslateServer or | 1406 // call FetchLanguageListFromTranslateServer or |
| 1410 // StartRepeatedVariationsSeedFetch. | 1407 // StartRepeatedVariationsSeedFetch. |
| 1411 if (parameters().ui_task == NULL) { | 1408 if (parameters().ui_task == NULL) { |
| 1412 // Request new variations seed information from server. | 1409 // Request new variations seed information from server. |
| 1413 browser_process_->variations_service()-> | 1410 browser_process_->variations_service()-> |
| 1414 StartRepeatedVariationsSeedFetch(); | 1411 StartRepeatedVariationsSeedFetch(); |
| 1415 | 1412 #if !defined(OS_CHROMEOS) |
| 1413 // TODO(mad): Move this call in a proper place on CrOS. |
| 1414 // http://crosbug.com/17687 |
| 1416 if (translate_manager_ != NULL) { | 1415 if (translate_manager_ != NULL) { |
| 1417 translate_manager_->FetchLanguageListFromTranslateServer( | 1416 translate_manager_->FetchLanguageListFromTranslateServer( |
| 1418 profile_->GetPrefs()); | 1417 profile_->GetPrefs()); |
| 1419 } | 1418 } |
| 1419 #endif |
| 1420 } | 1420 } |
| 1421 #endif | |
| 1422 | 1421 |
| 1423 run_message_loop_ = true; | 1422 run_message_loop_ = true; |
| 1424 } else { | 1423 } else { |
| 1425 run_message_loop_ = false; | 1424 run_message_loop_ = false; |
| 1426 } | 1425 } |
| 1427 browser_creator_.reset(); | 1426 browser_creator_.reset(); |
| 1428 #endif // !defined(OS_ANDROID) | 1427 #endif // !defined(OS_ANDROID) |
| 1429 | 1428 |
| 1430 PostBrowserStart(); | 1429 PostBrowserStart(); |
| 1431 | 1430 |
| (...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1611 if (base::win::GetVersion() <= base::win::VERSION_XP) | 1610 if (base::win::GetVersion() <= base::win::VERSION_XP) |
| 1612 uma_name += "_XP"; | 1611 uma_name += "_XP"; |
| 1613 | 1612 |
| 1614 uma_name += "_PreRead_"; | 1613 uma_name += "_PreRead_"; |
| 1615 uma_name += pre_read_percentage; | 1614 uma_name += pre_read_percentage; |
| 1616 AddPreReadHistogramTime(uma_name.c_str(), time); | 1615 AddPreReadHistogramTime(uma_name.c_str(), time); |
| 1617 } | 1616 } |
| 1618 #endif | 1617 #endif |
| 1619 #endif | 1618 #endif |
| 1620 } | 1619 } |
| OLD | NEW |