| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/chromeos/chrome_browser_main_chromeos.h" | 5 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "ash/ash_switches.h" | 10 #include "ash/ash_switches.h" |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 #include "chromeos/network/network_handler.h" | 103 #include "chromeos/network/network_handler.h" |
| 104 #include "chromeos/system/statistics_provider.h" | 104 #include "chromeos/system/statistics_provider.h" |
| 105 #include "chromeos/tpm_token_loader.h" | 105 #include "chromeos/tpm_token_loader.h" |
| 106 #include "components/metrics/metrics_service.h" | 106 #include "components/metrics/metrics_service.h" |
| 107 #include "components/session_manager/core/session_manager.h" | 107 #include "components/session_manager/core/session_manager.h" |
| 108 #include "components/user_manager/user.h" | 108 #include "components/user_manager/user.h" |
| 109 #include "content/public/browser/browser_thread.h" | 109 #include "content/public/browser/browser_thread.h" |
| 110 #include "content/public/browser/notification_service.h" | 110 #include "content/public/browser/notification_service.h" |
| 111 #include "content/public/browser/power_save_blocker.h" | 111 #include "content/public/browser/power_save_blocker.h" |
| 112 #include "content/public/common/main_function_params.h" | 112 #include "content/public/common/main_function_params.h" |
| 113 #include "grit/platform_locale_settings.h" | |
| 114 #include "media/audio/sounds/sounds_manager.h" | 113 #include "media/audio/sounds/sounds_manager.h" |
| 115 #include "net/base/network_change_notifier.h" | 114 #include "net/base/network_change_notifier.h" |
| 116 #include "net/url_request/url_request.h" | 115 #include "net/url_request/url_request.h" |
| 117 #include "net/url_request/url_request_context_getter.h" | 116 #include "net/url_request/url_request_context_getter.h" |
| 118 #include "ui/base/touch/touch_device.h" | 117 #include "ui/base/touch/touch_device.h" |
| 119 #include "ui/events/event_utils.h" | 118 #include "ui/events/event_utils.h" |
| 120 | 119 |
| 121 // Exclude X11 dependents for ozone | 120 // Exclude X11 dependents for ozone |
| 122 #if defined(USE_X11) | 121 #if defined(USE_X11) |
| 123 #include "chrome/browser/chromeos/device_uma.h" | 122 #include "chrome/browser/chromeos/device_uma.h" |
| (...skipping 606 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 730 // Destroy DBus services immediately after threads are stopped. | 729 // Destroy DBus services immediately after threads are stopped. |
| 731 dbus_services_.reset(); | 730 dbus_services_.reset(); |
| 732 | 731 |
| 733 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 732 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
| 734 | 733 |
| 735 // Destroy DeviceSettingsService after g_browser_process. | 734 // Destroy DeviceSettingsService after g_browser_process. |
| 736 DeviceSettingsService::Shutdown(); | 735 DeviceSettingsService::Shutdown(); |
| 737 } | 736 } |
| 738 | 737 |
| 739 } // namespace chromeos | 738 } // namespace chromeos |
| OLD | NEW |