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

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

Issue 153153002: [chromeos] Move files from chromeos/power to chrome/browser/chromeos/power (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/chromeos/power/power_data_collector.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 #include "chrome/browser/chromeos/login/user_manager.h" 49 #include "chrome/browser/chromeos/login/user_manager.h"
50 #include "chrome/browser/chromeos/login/wallpaper_manager.h" 50 #include "chrome/browser/chromeos/login/wallpaper_manager.h"
51 #include "chrome/browser/chromeos/login/wizard_controller.h" 51 #include "chrome/browser/chromeos/login/wizard_controller.h"
52 #include "chrome/browser/chromeos/memory/oom_priority_manager.h" 52 #include "chrome/browser/chromeos/memory/oom_priority_manager.h"
53 #include "chrome/browser/chromeos/net/network_portal_detector.h" 53 #include "chrome/browser/chromeos/net/network_portal_detector.h"
54 #include "chrome/browser/chromeos/options/cert_library.h" 54 #include "chrome/browser/chromeos/options/cert_library.h"
55 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 55 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
56 #include "chrome/browser/chromeos/power/idle_action_warning_observer.h" 56 #include "chrome/browser/chromeos/power/idle_action_warning_observer.h"
57 #include "chrome/browser/chromeos/power/peripheral_battery_observer.h" 57 #include "chrome/browser/chromeos/power/peripheral_battery_observer.h"
58 #include "chrome/browser/chromeos/power/power_button_observer.h" 58 #include "chrome/browser/chromeos/power/power_button_observer.h"
59 #include "chrome/browser/chromeos/power/power_data_collector.h"
59 #include "chrome/browser/chromeos/power/power_prefs.h" 60 #include "chrome/browser/chromeos/power/power_prefs.h"
60 #include "chrome/browser/chromeos/profiles/profile_helper.h" 61 #include "chrome/browser/chromeos/profiles/profile_helper.h"
61 #include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h " 62 #include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h "
62 #include "chrome/browser/chromeos/settings/device_settings_service.h" 63 #include "chrome/browser/chromeos/settings/device_settings_service.h"
63 #include "chrome/browser/chromeos/settings/owner_key_util.h" 64 #include "chrome/browser/chromeos/settings/owner_key_util.h"
64 #include "chrome/browser/chromeos/status/data_promo_notification.h" 65 #include "chrome/browser/chromeos/status/data_promo_notification.h"
65 #include "chrome/browser/chromeos/system_key_event_listener.h" 66 #include "chrome/browser/chromeos/system_key_event_listener.h"
66 #include "chrome/browser/chromeos/upgrade_detector_chromeos.h" 67 #include "chrome/browser/chromeos/upgrade_detector_chromeos.h"
67 #include "chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h" 68 #include "chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h"
68 #include "chrome/browser/defaults.h" 69 #include "chrome/browser/defaults.h"
(...skipping 18 matching lines...) Expand all
87 #include "chromeos/dbus/dbus_thread_manager.h" 88 #include "chromeos/dbus/dbus_thread_manager.h"
88 #include "chromeos/dbus/power_policy_controller.h" 89 #include "chromeos/dbus/power_policy_controller.h"
89 #include "chromeos/dbus/session_manager_client.h" 90 #include "chromeos/dbus/session_manager_client.h"
90 #include "chromeos/disks/disk_mount_manager.h" 91 #include "chromeos/disks/disk_mount_manager.h"
91 #include "chromeos/ime/input_method_manager.h" 92 #include "chromeos/ime/input_method_manager.h"
92 #include "chromeos/ime/xkeyboard.h" 93 #include "chromeos/ime/xkeyboard.h"
93 #include "chromeos/login/login_state.h" 94 #include "chromeos/login/login_state.h"
94 #include "chromeos/network/network_change_notifier_chromeos.h" 95 #include "chromeos/network/network_change_notifier_chromeos.h"
95 #include "chromeos/network/network_change_notifier_factory_chromeos.h" 96 #include "chromeos/network/network_change_notifier_factory_chromeos.h"
96 #include "chromeos/network/network_handler.h" 97 #include "chromeos/network/network_handler.h"
97 #include "chromeos/power/power_data_collector.h"
98 #include "chromeos/system/statistics_provider.h" 98 #include "chromeos/system/statistics_provider.h"
99 #include "chromeos/tpm_token_loader.h" 99 #include "chromeos/tpm_token_loader.h"
100 #include "content/public/browser/browser_thread.h" 100 #include "content/public/browser/browser_thread.h"
101 #include "content/public/browser/notification_service.h" 101 #include "content/public/browser/notification_service.h"
102 #include "content/public/browser/power_save_blocker.h" 102 #include "content/public/browser/power_save_blocker.h"
103 #include "content/public/common/main_function_params.h" 103 #include "content/public/common/main_function_params.h"
104 #include "grit/platform_locale_settings.h" 104 #include "grit/platform_locale_settings.h"
105 #include "media/audio/sounds/sounds_manager.h" 105 #include "media/audio/sounds/sounds_manager.h"
106 #include "net/base/network_change_notifier.h" 106 #include "net/base/network_change_notifier.h"
107 #include "net/url_request/url_request.h" 107 #include "net/url_request/url_request.h"
(...skipping 714 matching lines...) Expand 10 before | Expand all | Expand 10 after
822 // Destroy DBus services immediately after threads are stopped. 822 // Destroy DBus services immediately after threads are stopped.
823 dbus_services_.reset(); 823 dbus_services_.reset();
824 824
825 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 825 ChromeBrowserMainPartsLinux::PostDestroyThreads();
826 826
827 // Destroy DeviceSettingsService after g_browser_process. 827 // Destroy DeviceSettingsService after g_browser_process.
828 DeviceSettingsService::Shutdown(); 828 DeviceSettingsService::Shutdown();
829 } 829 }
830 830
831 } // namespace chromeos 831 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/power/power_data_collector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698