chrome/browser/chromeos/chrome_browser_main_chromeos.cc - Issue 477663004: Merged FakedDBusThreadManager with DBusThreadManager.

Side by Side Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 477663004: Merged FakedDBusThreadManager with DBusThreadManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/browsing_data/browsing_data_remover_unittest.cc ('k') | chrome/browser/chromeos/customization_document_unittest.cc » ('j') | chrome/browser/chromeos/policy/device_policy_cros_browser_test.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 73 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
84 #include "chrome/common/pref_names.h"	84 #include "chrome/common/pref_names.h"

85 #include "chromeos/audio/audio_devices_pref_handler.h"	85 #include "chromeos/audio/audio_devices_pref_handler.h"

86 #include "chromeos/audio/cras_audio_handler.h"	86 #include "chromeos/audio/cras_audio_handler.h"

87 #include "chromeos/cert_loader.h"	87 #include "chromeos/cert_loader.h"

88 #include "chromeos/chromeos_paths.h"	88 #include "chromeos/chromeos_paths.h"

89 #include "chromeos/chromeos_switches.h"	89 #include "chromeos/chromeos_switches.h"

90 #include "chromeos/cryptohome/async_method_caller.h"	90 #include "chromeos/cryptohome/async_method_caller.h"

91 #include "chromeos/cryptohome/homedir_methods.h"	91 #include "chromeos/cryptohome/homedir_methods.h"

92 #include "chromeos/cryptohome/system_salt_getter.h"	92 #include "chromeos/cryptohome/system_salt_getter.h"

93 #include "chromeos/dbus/dbus_thread_manager.h"	93 #include "chromeos/dbus/dbus_thread_manager.h"

94 #include "chromeos/dbus/power_policy_controller.h"

95 #include "chromeos/dbus/session_manager_client.h"	94 #include "chromeos/dbus/session_manager_client.h"

96 #include "chromeos/disks/disk_mount_manager.h"	95 #include "chromeos/disks/disk_mount_manager.h"

97 #include "chromeos/ime/ime_keyboard.h"	96 #include "chromeos/ime/ime_keyboard.h"

98 #include "chromeos/ime/input_method_manager.h"	97 #include "chromeos/ime/input_method_manager.h"

99 #include "chromeos/login/login_state.h"	98 #include "chromeos/login/login_state.h"

100 #include "chromeos/login/user_names.h"	99 #include "chromeos/login/user_names.h"

101 #include "chromeos/login_event_recorder.h"	100 #include "chromeos/login_event_recorder.h"

102 #include "chromeos/network/network_change_notifier_chromeos.h"	101 #include "chromeos/network/network_change_notifier_chromeos.h"

103 #include "chromeos/network/network_change_notifier_factory_chromeos.h"	102 #include "chromeos/network/network_change_notifier_factory_chromeos.h"

104 #include "chromeos/network/network_handler.h"	103 #include "chromeos/network/network_handler.h"

(...skipping 640 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
745 // Destroy DBus services immediately after threads are stopped.	744 // Destroy DBus services immediately after threads are stopped.

746 dbus_services_.reset();	745 dbus_services_.reset();

747	746

748 ChromeBrowserMainPartsLinux::PostDestroyThreads();	747 ChromeBrowserMainPartsLinux::PostDestroyThreads();

749	748

750 // Destroy DeviceSettingsService after g_browser_process.	749 // Destroy DeviceSettingsService after g_browser_process.

751 DeviceSettingsService::Shutdown();	750 DeviceSettingsService::Shutdown();

752 }	751 }

753	752

754 } // namespace chromeos	753 } // namespace chromeos

OLD	NEW