| 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 1404 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1415 profile_->GetPrefs()->GetString(prefs::kAcceptLanguages)); | 1415 profile_->GetPrefs()->GetString(prefs::kAcceptLanguages)); |
| 1416 language_usage_metrics::LanguageUsageMetrics::RecordApplicationLanguage( | 1416 language_usage_metrics::LanguageUsageMetrics::RecordApplicationLanguage( |
| 1417 browser_process_->GetApplicationLocale()); | 1417 browser_process_->GetApplicationLocale()); |
| 1418 | 1418 |
| 1419 // Start watching for hangs during startup. We disarm this hang detector when | 1419 // Start watching for hangs during startup. We disarm this hang detector when |
| 1420 // ThreadWatcher takes over or when browser is shutdown or when | 1420 // ThreadWatcher takes over or when browser is shutdown or when |
| 1421 // startup_watcher_ is deleted. | 1421 // startup_watcher_ is deleted. |
| 1422 metrics::MetricsService::SetExecutionPhase( | 1422 metrics::MetricsService::SetExecutionPhase( |
| 1423 metrics::MetricsService::STARTUP_TIMEBOMB_ARM, | 1423 metrics::MetricsService::STARTUP_TIMEBOMB_ARM, |
| 1424 g_browser_process->local_state()); | 1424 g_browser_process->local_state()); |
| 1425 startup_watcher_->Arm(base::TimeDelta::FromSeconds(300)); | 1425 startup_watcher_->Arm(base::TimeDelta::FromSeconds(600)); |
| 1426 | 1426 |
| 1427 // On mobile, need for clean shutdown arises only when the application comes | 1427 // On mobile, need for clean shutdown arises only when the application comes |
| 1428 // to foreground (i.e. MetricsService::OnAppEnterForeground is called). | 1428 // to foreground (i.e. MetricsService::OnAppEnterForeground is called). |
| 1429 // http://crbug.com/179143 | 1429 // http://crbug.com/179143 |
| 1430 #if !defined(OS_ANDROID) | 1430 #if !defined(OS_ANDROID) |
| 1431 // Start watching for a hang. | 1431 // Start watching for a hang. |
| 1432 browser_process_->metrics_service()->LogNeedForCleanShutdown(); | 1432 browser_process_->metrics_service()->LogNeedForCleanShutdown(); |
| 1433 #endif | 1433 #endif |
| 1434 | 1434 |
| 1435 #if defined(ENABLE_FULL_PRINTING) | 1435 #if defined(ENABLE_FULL_PRINTING) |
| (...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1681 chromeos::CrosSettings::Shutdown(); | 1681 chromeos::CrosSettings::Shutdown(); |
| 1682 #endif | 1682 #endif |
| 1683 #endif | 1683 #endif |
| 1684 } | 1684 } |
| 1685 | 1685 |
| 1686 // Public members: | 1686 // Public members: |
| 1687 | 1687 |
| 1688 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1688 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 1689 chrome_extra_parts_.push_back(parts); | 1689 chrome_extra_parts_.push_back(parts); |
| 1690 } | 1690 } |
| OLD | NEW |