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

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

Issue 2345843003: [Sync] Merge //components/browser_sync into one directory. (Closed)
Patch Set: Address comment + rebase. Created 4 years, 3 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 8
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 #include "chromeos/disks/disk_mount_manager.h" 112 #include "chromeos/disks/disk_mount_manager.h"
113 #include "chromeos/login/login_state.h" 113 #include "chromeos/login/login_state.h"
114 #include "chromeos/login/user_names.h" 114 #include "chromeos/login/user_names.h"
115 #include "chromeos/login_event_recorder.h" 115 #include "chromeos/login_event_recorder.h"
116 #include "chromeos/network/network_change_notifier_chromeos.h" 116 #include "chromeos/network/network_change_notifier_chromeos.h"
117 #include "chromeos/network/network_change_notifier_factory_chromeos.h" 117 #include "chromeos/network/network_change_notifier_factory_chromeos.h"
118 #include "chromeos/network/network_handler.h" 118 #include "chromeos/network/network_handler.h"
119 #include "chromeos/network/portal_detector/network_portal_detector_stub.h" 119 #include "chromeos/network/portal_detector/network_portal_detector_stub.h"
120 #include "chromeos/system/statistics_provider.h" 120 #include "chromeos/system/statistics_provider.h"
121 #include "chromeos/tpm/tpm_token_loader.h" 121 #include "chromeos/tpm/tpm_token_loader.h"
122 #include "components/browser_sync/common/browser_sync_switches.h" 122 #include "components/browser_sync/browser_sync_switches.h"
123 #include "components/device_event_log/device_event_log.h" 123 #include "components/device_event_log/device_event_log.h"
124 #include "components/metrics/metrics_service.h" 124 #include "components/metrics/metrics_service.h"
125 #include "components/ownership/owner_key_util.h" 125 #include "components/ownership/owner_key_util.h"
126 #include "components/prefs/pref_service.h" 126 #include "components/prefs/pref_service.h"
127 #include "components/session_manager/core/session_manager.h" 127 #include "components/session_manager/core/session_manager.h"
128 #include "components/signin/core/account_id/account_id.h" 128 #include "components/signin/core/account_id/account_id.h"
129 #include "components/user_manager/user.h" 129 #include "components/user_manager/user.h"
130 #include "components/user_manager/user_manager.h" 130 #include "components/user_manager/user_manager.h"
131 #include "components/wallpaper/wallpaper_manager_base.h" 131 #include "components/wallpaper/wallpaper_manager_base.h"
132 #include "content/public/browser/browser_thread.h" 132 #include "content/public/browser/browser_thread.h"
(...skipping 746 matching lines...) Expand 10 before | Expand all | Expand 10 after
879 // Destroy DBus services immediately after threads are stopped. 879 // Destroy DBus services immediately after threads are stopped.
880 dbus_services_.reset(); 880 dbus_services_.reset();
881 881
882 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 882 ChromeBrowserMainPartsLinux::PostDestroyThreads();
883 883
884 // Destroy DeviceSettingsService after g_browser_process. 884 // Destroy DeviceSettingsService after g_browser_process.
885 DeviceSettingsService::Shutdown(); 885 DeviceSettingsService::Shutdown();
886 } 886 }
887 887
888 } // namespace chromeos 888 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/browsing_data/history_counter_browsertest.cc ('k') | chrome/browser/chromeos/extensions/input_method_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698