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

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

Issue 10824112: Move Chrome OS device settings stuff to chrome/browser/chromeos/settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 8 years, 4 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
OLDNEW
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 "base/bind.h" 10 #include "base/bind.h"
(...skipping 14 matching lines...) Expand all
25 #include "chrome/browser/chromeos/external_metrics.h" 25 #include "chrome/browser/chromeos/external_metrics.h"
26 #include "chrome/browser/chromeos/imageburner/burn_manager.h" 26 #include "chrome/browser/chromeos/imageburner/burn_manager.h"
27 #include "chrome/browser/chromeos/input_method/input_method_manager.h" 27 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
28 #include "chrome/browser/chromeos/input_method/xkeyboard.h" 28 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
29 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h" 29 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h"
30 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h" 30 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h"
31 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" 31 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
32 #include "chrome/browser/chromeos/login/authenticator.h" 32 #include "chrome/browser/chromeos/login/authenticator.h"
33 #include "chrome/browser/chromeos/login/login_utils.h" 33 #include "chrome/browser/chromeos/login/login_utils.h"
34 #include "chrome/browser/chromeos/login/login_wizard.h" 34 #include "chrome/browser/chromeos/login/login_wizard.h"
35 #include "chrome/browser/chromeos/login/ownership_service.h"
36 #include "chrome/browser/chromeos/login/screen_locker.h" 35 #include "chrome/browser/chromeos/login/screen_locker.h"
37 #include "chrome/browser/chromeos/login/session_manager_observer.h"
38 #include "chrome/browser/chromeos/login/user_manager.h" 36 #include "chrome/browser/chromeos/login/user_manager.h"
39 #include "chrome/browser/chromeos/login/wallpaper_manager.h" 37 #include "chrome/browser/chromeos/login/wallpaper_manager.h"
40 #include "chrome/browser/chromeos/low_memory_observer.h" 38 #include "chrome/browser/chromeos/low_memory_observer.h"
41 #include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h" 39 #include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h"
42 #include "chrome/browser/chromeos/net/network_change_notifier_chromeos.h" 40 #include "chrome/browser/chromeos/net/network_change_notifier_chromeos.h"
43 #include "chrome/browser/chromeos/oom_priority_manager.h" 41 #include "chrome/browser/chromeos/oom_priority_manager.h"
44 #include "chrome/browser/chromeos/power/brightness_observer.h" 42 #include "chrome/browser/chromeos/power/brightness_observer.h"
45 #include "chrome/browser/chromeos/power/output_observer.h" 43 #include "chrome/browser/chromeos/power/output_observer.h"
46 #include "chrome/browser/chromeos/power/power_button_controller_delegate_chromeo s.h" 44 #include "chrome/browser/chromeos/power/power_button_controller_delegate_chromeo s.h"
47 #include "chrome/browser/chromeos/power/power_button_observer.h" 45 #include "chrome/browser/chromeos/power/power_button_observer.h"
48 #include "chrome/browser/chromeos/power/power_state_override.h" 46 #include "chrome/browser/chromeos/power/power_state_override.h"
49 #include "chrome/browser/chromeos/power/resume_observer.h" 47 #include "chrome/browser/chromeos/power/resume_observer.h"
50 #include "chrome/browser/chromeos/power/screen_dimming_observer.h" 48 #include "chrome/browser/chromeos/power/screen_dimming_observer.h"
51 #include "chrome/browser/chromeos/power/screen_lock_observer.h" 49 #include "chrome/browser/chromeos/power/screen_lock_observer.h"
52 #include "chrome/browser/chromeos/power/user_activity_notifier.h" 50 #include "chrome/browser/chromeos/power/user_activity_notifier.h"
53 #include "chrome/browser/chromeos/power/video_activity_notifier.h" 51 #include "chrome/browser/chromeos/power/video_activity_notifier.h"
52 #include "chrome/browser/chromeos/settings/ownership_service.h"
53 #include "chrome/browser/chromeos/settings/session_manager_observer.h"
54 #include "chrome/browser/chromeos/system/statistics_provider.h" 54 #include "chrome/browser/chromeos/system/statistics_provider.h"
55 #include "chrome/browser/chromeos/system_key_event_listener.h" 55 #include "chrome/browser/chromeos/system_key_event_listener.h"
56 #include "chrome/browser/chromeos/upgrade_detector_chromeos.h" 56 #include "chrome/browser/chromeos/upgrade_detector_chromeos.h"
57 #include "chrome/browser/chromeos/web_socket_proxy_controller.h" 57 #include "chrome/browser/chromeos/web_socket_proxy_controller.h"
58 #include "chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h" 58 #include "chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h"
59 #include "chrome/browser/defaults.h" 59 #include "chrome/browser/defaults.h"
60 #include "chrome/browser/media_gallery/media_device_notifications_chromeos.h" 60 #include "chrome/browser/media_gallery/media_device_notifications_chromeos.h"
61 #include "chrome/browser/metrics/metrics_service.h" 61 #include "chrome/browser/metrics/metrics_service.h"
62 #include "chrome/browser/net/chrome_network_delegate.h" 62 #include "chrome/browser/net/chrome_network_delegate.h"
63 #include "chrome/browser/policy/browser_policy_connector.h" 63 #include "chrome/browser/policy/browser_policy_connector.h"
(...skipping 517 matching lines...) Expand 10 before | Expand all | Expand 10 after
581 LOG(WARNING) << "low_mem: Part of '100MB' experiment"; 581 LOG(WARNING) << "low_mem: Part of '100MB' experiment";
582 chromeos::LowMemoryObserver::SetLowMemoryMargin(100); 582 chromeos::LowMemoryObserver::SetLowMemoryMargin(100);
583 } else if (trial->group() == margin_200mb) { 583 } else if (trial->group() == margin_200mb) {
584 LOG(WARNING) << "low_mem: Part of '200MB' experiment"; 584 LOG(WARNING) << "low_mem: Part of '200MB' experiment";
585 chromeos::LowMemoryObserver::SetLowMemoryMargin(200); 585 chromeos::LowMemoryObserver::SetLowMemoryMargin(200);
586 } else { 586 } else {
587 LOG(WARNING) << "low_mem: Part of 'default' experiment"; 587 LOG(WARNING) << "low_mem: Part of 'default' experiment";
588 } 588 }
589 } 589 }
590 } 590 }
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_main_linux.cc ('k') | chrome/browser/chromeos/cros/network_library_impl_cros.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698