Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(461)

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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
OLDNEW
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 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
11 11
12 #include "ash/ash_switches.h" 12 #include "ash/ash_switches.h"
13 #include "ash/shell.h" 13 #include "ash/shell.h"
14 #include "base/bind.h" 14 #include "base/bind.h"
15 #include "base/callback.h" 15 #include "base/callback.h"
16 #include "base/command_line.h" 16 #include "base/command_line.h"
17 #include "base/files/file_util.h" 17 #include "base/files/file_util.h"
18 #include "base/lazy_instance.h" 18 #include "base/lazy_instance.h"
19 #include "base/linux_util.h" 19 #include "base/linux_util.h"
20 #include "base/macros.h" 20 #include "base/macros.h"
21 #include "base/path_service.h" 21 #include "base/path_service.h"
22 #include "base/prefs/pref_service.h"
23 #include "base/strings/string_number_conversions.h" 22 #include "base/strings/string_number_conversions.h"
24 #include "base/strings/string_split.h" 23 #include "base/strings/string_split.h"
25 #include "base/sys_info.h" 24 #include "base/sys_info.h"
26 #include "base/task_runner_util.h" 25 #include "base/task_runner_util.h"
27 #include "chrome/browser/browser_process.h" 26 #include "chrome/browser/browser_process.h"
28 #include "chrome/browser/browser_process_platform_part_chromeos.h" 27 #include "chrome/browser/browser_process_platform_part_chromeos.h"
29 #include "chrome/browser/chrome_notification_types.h" 28 #include "chrome/browser/chrome_notification_types.h"
30 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 29 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
31 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" 30 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
32 #include "chrome/browser/chromeos/accessibility/spoken_feedback_event_rewriter.h " 31 #include "chrome/browser/chromeos/accessibility/spoken_feedback_event_rewriter.h "
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 #include "chromeos/network/network_handler.h" 112 #include "chromeos/network/network_handler.h"
114 #include "chromeos/network/portal_detector/network_portal_detector_stub.h" 113 #include "chromeos/network/portal_detector/network_portal_detector_stub.h"
115 #include "chromeos/system/statistics_provider.h" 114 #include "chromeos/system/statistics_provider.h"
116 #include "chromeos/tpm/tpm_token_loader.h" 115 #include "chromeos/tpm/tpm_token_loader.h"
117 #include "components/arc/arc_bridge_service.h" 116 #include "components/arc/arc_bridge_service.h"
118 #include "components/arc/arc_service_manager.h" 117 #include "components/arc/arc_service_manager.h"
119 #include "components/browser_sync/common/browser_sync_switches.h" 118 #include "components/browser_sync/common/browser_sync_switches.h"
120 #include "components/device_event_log/device_event_log.h" 119 #include "components/device_event_log/device_event_log.h"
121 #include "components/metrics/metrics_service.h" 120 #include "components/metrics/metrics_service.h"
122 #include "components/ownership/owner_key_util.h" 121 #include "components/ownership/owner_key_util.h"
122 #include "components/prefs/pref_service.h"
123 #include "components/session_manager/core/session_manager.h" 123 #include "components/session_manager/core/session_manager.h"
124 #include "components/signin/core/account_id/account_id.h" 124 #include "components/signin/core/account_id/account_id.h"
125 #include "components/user_manager/user.h" 125 #include "components/user_manager/user.h"
126 #include "components/user_manager/user_manager.h" 126 #include "components/user_manager/user_manager.h"
127 #include "components/wallpaper/wallpaper_manager_base.h" 127 #include "components/wallpaper/wallpaper_manager_base.h"
128 #include "content/public/browser/browser_thread.h" 128 #include "content/public/browser/browser_thread.h"
129 #include "content/public/browser/notification_service.h" 129 #include "content/public/browser/notification_service.h"
130 #include "content/public/common/content_switches.h" 130 #include "content/public/common/content_switches.h"
131 #include "content/public/common/main_function_params.h" 131 #include "content/public/common/main_function_params.h"
132 #include "device/bluetooth/bluetooth_adapter_factory.h" 132 #include "device/bluetooth/bluetooth_adapter_factory.h"
(...skipping 697 matching lines...) Expand 10 before | Expand all | Expand 10 after
830 // Destroy DBus services immediately after threads are stopped. 830 // Destroy DBus services immediately after threads are stopped.
831 dbus_services_.reset(); 831 dbus_services_.reset();
832 832
833 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 833 ChromeBrowserMainPartsLinux::PostDestroyThreads();
834 834
835 // Destroy DeviceSettingsService after g_browser_process. 835 // Destroy DeviceSettingsService after g_browser_process.
836 DeviceSettingsService::Shutdown(); 836 DeviceSettingsService::Shutdown();
837 } 837 }
838 838
839 } // namespace chromeos 839 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/boot_times_recorder.cc ('k') | chrome/browser/chromeos/customization/customization_document.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698