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

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

Issue 1188823002: [MemoryPressure] Move chrome/browser/chromeos/* to chrome/browser/memory/*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed sky@ comments. Created 5 years, 6 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 <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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 #include "chrome/browser/chromeos/input_method/input_method_util.h" 43 #include "chrome/browser/chromeos/input_method/input_method_util.h"
44 #include "chrome/browser/chromeos/language_preferences.h" 44 #include "chrome/browser/chromeos/language_preferences.h"
45 #include "chrome/browser/chromeos/login/helper.h" 45 #include "chrome/browser/chromeos/login/helper.h"
46 #include "chrome/browser/chromeos/login/lock/screen_locker.h" 46 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
47 #include "chrome/browser/chromeos/login/login_wizard.h" 47 #include "chrome/browser/chromeos/login/login_wizard.h"
48 #include "chrome/browser/chromeos/login/session/user_session_manager.h" 48 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
49 #include "chrome/browser/chromeos/login/startup_utils.h" 49 #include "chrome/browser/chromeos/login/startup_utils.h"
50 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" 50 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
51 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" 51 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
52 #include "chrome/browser/chromeos/login/wizard_controller.h" 52 #include "chrome/browser/chromeos/login/wizard_controller.h"
53 #include "chrome/browser/chromeos/memory/oom_priority_manager.h"
54 #include "chrome/browser/chromeos/net/network_portal_detector_impl.h" 53 #include "chrome/browser/chromeos/net/network_portal_detector_impl.h"
55 #include "chrome/browser/chromeos/net/wake_on_wifi_manager.h" 54 #include "chrome/browser/chromeos/net/wake_on_wifi_manager.h"
56 #include "chrome/browser/chromeos/options/cert_library.h" 55 #include "chrome/browser/chromeos/options/cert_library.h"
57 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_fact ory.h" 56 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_fact ory.h"
58 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 57 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
59 #include "chrome/browser/chromeos/policy/device_local_account.h" 58 #include "chrome/browser/chromeos/policy/device_local_account.h"
60 #include "chrome/browser/chromeos/power/freezer_cgroup_process_manager.h" 59 #include "chrome/browser/chromeos/power/freezer_cgroup_process_manager.h"
61 #include "chrome/browser/chromeos/power/idle_action_warning_observer.h" 60 #include "chrome/browser/chromeos/power/idle_action_warning_observer.h"
62 #include "chrome/browser/chromeos/power/peripheral_battery_observer.h" 61 #include "chrome/browser/chromeos/power/peripheral_battery_observer.h"
63 #include "chrome/browser/chromeos/power/power_button_observer.h" 62 #include "chrome/browser/chromeos/power/power_button_observer.h"
64 #include "chrome/browser/chromeos/power/power_data_collector.h" 63 #include "chrome/browser/chromeos/power/power_data_collector.h"
65 #include "chrome/browser/chromeos/power/power_prefs.h" 64 #include "chrome/browser/chromeos/power/power_prefs.h"
66 #include "chrome/browser/chromeos/power/renderer_freezer.h" 65 #include "chrome/browser/chromeos/power/renderer_freezer.h"
67 #include "chrome/browser/chromeos/profiles/profile_helper.h" 66 #include "chrome/browser/chromeos/profiles/profile_helper.h"
68 #include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h " 67 #include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h "
69 #include "chrome/browser/chromeos/settings/device_settings_service.h" 68 #include "chrome/browser/chromeos/settings/device_settings_service.h"
70 #include "chrome/browser/chromeos/status/data_promo_notification.h" 69 #include "chrome/browser/chromeos/status/data_promo_notification.h"
71 #include "chrome/browser/chromeos/system/input_device_settings.h" 70 #include "chrome/browser/chromeos/system/input_device_settings.h"
72 #include "chrome/browser/chromeos/upgrade_detector_chromeos.h" 71 #include "chrome/browser/chromeos/upgrade_detector_chromeos.h"
73 #include "chrome/browser/defaults.h" 72 #include "chrome/browser/defaults.h"
74 #include "chrome/browser/lifetime/application_lifetime.h" 73 #include "chrome/browser/lifetime/application_lifetime.h"
74 #include "chrome/browser/memory/oom_priority_manager.h"
75 #include "chrome/browser/net/chrome_network_delegate.h" 75 #include "chrome/browser/net/chrome_network_delegate.h"
76 #include "chrome/browser/profiles/profile.h" 76 #include "chrome/browser/profiles/profile.h"
77 #include "chrome/browser/profiles/profile_manager.h" 77 #include "chrome/browser/profiles/profile_manager.h"
78 #include "chrome/browser/rlz/rlz.h" 78 #include "chrome/browser/rlz/rlz.h"
79 #include "chrome/browser/ui/ash/network_connect_delegate_chromeos.h" 79 #include "chrome/browser/ui/ash/network_connect_delegate_chromeos.h"
80 #include "chrome/common/chrome_constants.h" 80 #include "chrome/common/chrome_constants.h"
81 #include "chrome/common/chrome_paths.h" 81 #include "chrome/common/chrome_paths.h"
82 #include "chrome/common/chrome_switches.h" 82 #include "chrome/common/chrome_switches.h"
83 #include "chrome/common/chrome_version_info.h" 83 #include "chrome/common/chrome_version_info.h"
84 #include "chrome/common/logging_chrome.h" 84 #include "chrome/common/logging_chrome.h"
(...skipping 690 matching lines...) Expand 10 before | Expand all | Expand 10 after
775 // Destroy DBus services immediately after threads are stopped. 775 // Destroy DBus services immediately after threads are stopped.
776 dbus_services_.reset(); 776 dbus_services_.reset();
777 777
778 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 778 ChromeBrowserMainPartsLinux::PostDestroyThreads();
779 779
780 // Destroy DeviceSettingsService after g_browser_process. 780 // Destroy DeviceSettingsService after g_browser_process.
781 DeviceSettingsService::Shutdown(); 781 DeviceSettingsService::Shutdown();
782 } 782 }
783 783
784 } // namespace chromeos 784 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/browser_process_platform_part_chromeos.cc ('k') | chrome/browser/chromeos/memory/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698