Chromium Code Reviews| 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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 78 #include "chrome/browser/policy/policy_service.h" | 78 #include "chrome/browser/policy/policy_service.h" |
| 79 #include "chrome/browser/prefs/chrome_pref_service_factory.h" | 79 #include "chrome/browser/prefs/chrome_pref_service_factory.h" |
| 80 #include "chrome/browser/prefs/command_line_pref_store.h" | 80 #include "chrome/browser/prefs/command_line_pref_store.h" |
| 81 #include "chrome/browser/prefs/scoped_user_pref_update.h" | 81 #include "chrome/browser/prefs/scoped_user_pref_update.h" |
| 82 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" | 82 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" |
| 83 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory. h" | 83 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory. h" |
| 84 #include "chrome/browser/process_singleton.h" | 84 #include "chrome/browser/process_singleton.h" |
| 85 #include "chrome/browser/profiles/profile.h" | 85 #include "chrome/browser/profiles/profile.h" |
| 86 #include "chrome/browser/profiles/profile_manager.h" | 86 #include "chrome/browser/profiles/profile_manager.h" |
| 87 #include "chrome/browser/renderer_host/chrome_render_view_host_observer.h" | 87 #include "chrome/browser/renderer_host/chrome_render_view_host_observer.h" |
| 88 #include "chrome/browser/rlz/rlz.h" | |
| 88 #include "chrome/browser/search_engines/search_engine_type.h" | 89 #include "chrome/browser/search_engines/search_engine_type.h" |
| 89 #include "chrome/browser/search_engines/template_url.h" | 90 #include "chrome/browser/search_engines/template_url.h" |
| 90 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" | 91 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" |
| 91 #include "chrome/browser/search_engines/template_url_service.h" | 92 #include "chrome/browser/search_engines/template_url_service.h" |
| 92 #include "chrome/browser/search_engines/template_url_service_factory.h" | 93 #include "chrome/browser/search_engines/template_url_service_factory.h" |
| 93 #include "chrome/browser/service/service_process_control.h" | 94 #include "chrome/browser/service/service_process_control.h" |
| 94 #include "chrome/browser/shell_integration.h" | 95 #include "chrome/browser/shell_integration.h" |
| 95 #include "chrome/browser/three_d_api_observer.h" | 96 #include "chrome/browser/three_d_api_observer.h" |
| 96 #include "chrome/browser/translate/translate_manager.h" | 97 #include "chrome/browser/translate/translate_manager.h" |
| 97 #include "chrome/browser/ui/app_list/app_list_service.h" | 98 #include "chrome/browser/ui/app_list/app_list_service.h" |
| (...skipping 1512 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1610 NOTREACHED(); | 1611 NOTREACHED(); |
| 1611 #else | 1612 #else |
| 1612 | 1613 |
| 1613 #if defined(USE_X11) | 1614 #if defined(USE_X11) |
| 1614 // Unset the X11 error handlers. The X11 error handlers log the errors using a | 1615 // Unset the X11 error handlers. The X11 error handlers log the errors using a |
| 1615 // |PostTask()| on the message-loop. But since the message-loop is in the | 1616 // |PostTask()| on the message-loop. But since the message-loop is in the |
| 1616 // process of terminating, this can cause errors. | 1617 // process of terminating, this can cause errors. |
| 1617 UnsetBrowserX11ErrorHandlers(); | 1618 UnsetBrowserX11ErrorHandlers(); |
| 1618 #endif | 1619 #endif |
| 1619 | 1620 |
| 1621 #if defined(ENABLE_RLZ) | |
| 1622 RLZTracker::PostMainMessageLoopRun(); | |
|
Roger Tawa OOO till Jul 10th
2013/04/29 16:56:45
Browser shutdown already calls RLZTracker::Cleanup
bcwhite
2013/04/29 19:21:34
Done.
| |
| 1623 #endif | |
| 1624 | |
| 1620 // Start watching for jank during shutdown. It gets disarmed when | 1625 // Start watching for jank during shutdown. It gets disarmed when |
| 1621 // |shutdown_watcher_| object is destructed. | 1626 // |shutdown_watcher_| object is destructed. |
| 1622 shutdown_watcher_->Arm(base::TimeDelta::FromSeconds(300)); | 1627 shutdown_watcher_->Arm(base::TimeDelta::FromSeconds(300)); |
| 1623 | 1628 |
| 1624 // Disarm the startup hang detector time bomb if it is still Arm'ed. | 1629 // Disarm the startup hang detector time bomb if it is still Arm'ed. |
| 1625 startup_watcher_->Disarm(); | 1630 startup_watcher_->Disarm(); |
| 1626 | 1631 |
| 1627 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i) | 1632 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i) |
| 1628 chrome_extra_parts_[i]->PostMainMessageLoopRun(); | 1633 chrome_extra_parts_[i]->PostMainMessageLoopRun(); |
| 1629 | 1634 |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1749 if (base::win::GetVersion() <= base::win::VERSION_XP) | 1754 if (base::win::GetVersion() <= base::win::VERSION_XP) |
| 1750 uma_name += "_XP"; | 1755 uma_name += "_XP"; |
| 1751 | 1756 |
| 1752 uma_name += "_PreRead_"; | 1757 uma_name += "_PreRead_"; |
| 1753 uma_name += pre_read_percentage; | 1758 uma_name += pre_read_percentage; |
| 1754 AddPreReadHistogramTime(uma_name.c_str(), time); | 1759 AddPreReadHistogramTime(uma_name.c_str(), time); |
| 1755 } | 1760 } |
| 1756 #endif | 1761 #endif |
| 1757 #endif | 1762 #endif |
| 1758 } | 1763 } |
| OLD | NEW |