| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/shell.h" | 10 #include "ash/shell.h" |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 #include "chrome/browser/chromeos/power/user_activity_notifier.h" | 52 #include "chrome/browser/chromeos/power/user_activity_notifier.h" |
| 53 #include "chrome/browser/chromeos/power/video_activity_notifier.h" | 53 #include "chrome/browser/chromeos/power/video_activity_notifier.h" |
| 54 #include "chrome/browser/chromeos/settings/device_settings_service.h" | 54 #include "chrome/browser/chromeos/settings/device_settings_service.h" |
| 55 #include "chrome/browser/chromeos/settings/owner_key_util.h" | 55 #include "chrome/browser/chromeos/settings/owner_key_util.h" |
| 56 #include "chrome/browser/chromeos/system/statistics_provider.h" | 56 #include "chrome/browser/chromeos/system/statistics_provider.h" |
| 57 #include "chrome/browser/chromeos/system_key_event_listener.h" | 57 #include "chrome/browser/chromeos/system_key_event_listener.h" |
| 58 #include "chrome/browser/chromeos/upgrade_detector_chromeos.h" | 58 #include "chrome/browser/chromeos/upgrade_detector_chromeos.h" |
| 59 #include "chrome/browser/chromeos/web_socket_proxy_controller.h" | 59 #include "chrome/browser/chromeos/web_socket_proxy_controller.h" |
| 60 #include "chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h" | 60 #include "chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h" |
| 61 #include "chrome/browser/defaults.h" | 61 #include "chrome/browser/defaults.h" |
| 62 #include "chrome/browser/media_gallery/media_device_notifications_chromeos.h" | |
| 63 #include "chrome/browser/metrics/metrics_service.h" | 62 #include "chrome/browser/metrics/metrics_service.h" |
| 64 #include "chrome/browser/net/chrome_network_delegate.h" | 63 #include "chrome/browser/net/chrome_network_delegate.h" |
| 65 #include "chrome/browser/policy/browser_policy_connector.h" | 64 #include "chrome/browser/policy/browser_policy_connector.h" |
| 66 #include "chrome/browser/policy/network_configuration_updater.h" | 65 #include "chrome/browser/policy/network_configuration_updater.h" |
| 67 #include "chrome/browser/prefs/pref_service.h" | 66 #include "chrome/browser/prefs/pref_service.h" |
| 68 #include "chrome/browser/profiles/profile.h" | 67 #include "chrome/browser/profiles/profile.h" |
| 69 #include "chrome/browser/profiles/profile_manager.h" | 68 #include "chrome/browser/profiles/profile_manager.h" |
| 70 #include "chrome/browser/signin/token_service_factory.h" | 69 #include "chrome/browser/signin/token_service_factory.h" |
| 70 #include "chrome/browser/system_monitor/media_device_notifications_chromeos.h" |
| 71 #include "chrome/common/chrome_notification_types.h" | 71 #include "chrome/common/chrome_notification_types.h" |
| 72 #include "chrome/common/chrome_switches.h" | 72 #include "chrome/common/chrome_switches.h" |
| 73 #include "chrome/common/chrome_version_info.h" | 73 #include "chrome/common/chrome_version_info.h" |
| 74 #include "chrome/common/logging_chrome.h" | 74 #include "chrome/common/logging_chrome.h" |
| 75 #include "chrome/common/pref_names.h" | 75 #include "chrome/common/pref_names.h" |
| 76 #include "chromeos/cryptohome/async_method_caller.h" | 76 #include "chromeos/cryptohome/async_method_caller.h" |
| 77 #include "chromeos/dbus/dbus_thread_manager.h" | 77 #include "chromeos/dbus/dbus_thread_manager.h" |
| 78 #include "chromeos/dbus/power_manager_client.h" | 78 #include "chromeos/dbus/power_manager_client.h" |
| 79 #include "chromeos/dbus/session_manager_client.h" | 79 #include "chromeos/dbus/session_manager_client.h" |
| 80 #include "chromeos/disks/disk_mount_manager.h" | 80 #include "chromeos/disks/disk_mount_manager.h" |
| (...skipping 530 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 611 LOG(WARNING) << "low_mem: Part of '100MB' experiment"; | 611 LOG(WARNING) << "low_mem: Part of '100MB' experiment"; |
| 612 chromeos::LowMemoryObserver::SetLowMemoryMargin(100); | 612 chromeos::LowMemoryObserver::SetLowMemoryMargin(100); |
| 613 } else if (trial->group() == margin_200mb) { | 613 } else if (trial->group() == margin_200mb) { |
| 614 LOG(WARNING) << "low_mem: Part of '200MB' experiment"; | 614 LOG(WARNING) << "low_mem: Part of '200MB' experiment"; |
| 615 chromeos::LowMemoryObserver::SetLowMemoryMargin(200); | 615 chromeos::LowMemoryObserver::SetLowMemoryMargin(200); |
| 616 } else { | 616 } else { |
| 617 LOG(WARNING) << "low_mem: Part of 'default' experiment"; | 617 LOG(WARNING) << "low_mem: Part of 'default' experiment"; |
| 618 } | 618 } |
| 619 } | 619 } |
| 620 } | 620 } |
| OLD | NEW |