| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| 11 #include <vector> | 11 #include <vector> |
| 12 | 12 |
| 13 #include "ash/common/ash_switches.h" | |
| 14 #include "ash/shell.h" | 13 #include "ash/shell.h" |
| 15 #include "base/bind.h" | 14 #include "base/bind.h" |
| 16 #include "base/callback.h" | 15 #include "base/callback.h" |
| 17 #include "base/command_line.h" | 16 #include "base/command_line.h" |
| 18 #include "base/files/file_util.h" | 17 #include "base/files/file_util.h" |
| 19 #include "base/lazy_instance.h" | 18 #include "base/lazy_instance.h" |
| 20 #include "base/linux_util.h" | 19 #include "base/linux_util.h" |
| 21 #include "base/macros.h" | 20 #include "base/macros.h" |
| 22 #include "base/memory/ptr_util.h" | 21 #include "base/memory/ptr_util.h" |
| 23 #include "base/path_service.h" | 22 #include "base/path_service.h" |
| (...skipping 851 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 875 // Destroy DBus services immediately after threads are stopped. | 874 // Destroy DBus services immediately after threads are stopped. |
| 876 dbus_services_.reset(); | 875 dbus_services_.reset(); |
| 877 | 876 |
| 878 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 877 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
| 879 | 878 |
| 880 // Destroy DeviceSettingsService after g_browser_process. | 879 // Destroy DeviceSettingsService after g_browser_process. |
| 881 DeviceSettingsService::Shutdown(); | 880 DeviceSettingsService::Shutdown(); |
| 882 } | 881 } |
| 883 | 882 |
| 884 } // namespace chromeos | 883 } // namespace chromeos |
| OLD | NEW |