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

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

Issue 12093058: Screensaver implementation for ChromeOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: build fixes. Created 7 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
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/shell.h" 10 #include "ash/shell.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 #include "chrome/browser/chromeos/net/network_portal_detector.h" 52 #include "chrome/browser/chromeos/net/network_portal_detector.h"
53 #include "chrome/browser/chromeos/power/brightness_observer.h" 53 #include "chrome/browser/chromeos/power/brightness_observer.h"
54 #include "chrome/browser/chromeos/power/output_observer.h" 54 #include "chrome/browser/chromeos/power/output_observer.h"
55 #include "chrome/browser/chromeos/power/power_button_observer.h" 55 #include "chrome/browser/chromeos/power/power_button_observer.h"
56 #include "chrome/browser/chromeos/power/resume_observer.h" 56 #include "chrome/browser/chromeos/power/resume_observer.h"
57 #include "chrome/browser/chromeos/power/screen_dimming_observer.h" 57 #include "chrome/browser/chromeos/power/screen_dimming_observer.h"
58 #include "chrome/browser/chromeos/power/screen_lock_observer.h" 58 #include "chrome/browser/chromeos/power/screen_lock_observer.h"
59 #include "chrome/browser/chromeos/power/suspend_observer.h" 59 #include "chrome/browser/chromeos/power/suspend_observer.h"
60 #include "chrome/browser/chromeos/power/user_activity_notifier.h" 60 #include "chrome/browser/chromeos/power/user_activity_notifier.h"
61 #include "chrome/browser/chromeos/power/video_activity_notifier.h" 61 #include "chrome/browser/chromeos/power/video_activity_notifier.h"
62 #include "chrome/browser/chromeos/screensaver/screensaver_controller.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/system/statistics_provider.h" 65 #include "chrome/browser/chromeos/system/statistics_provider.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/web_socket_proxy_controller.h" 68 #include "chrome/browser/chromeos/web_socket_proxy_controller.h"
68 #include "chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h" 69 #include "chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h"
69 #include "chrome/browser/defaults.h" 70 #include "chrome/browser/defaults.h"
70 #include "chrome/browser/metrics/metrics_service.h" 71 #include "chrome/browser/metrics/metrics_service.h"
71 #include "chrome/browser/net/chrome_network_delegate.h" 72 #include "chrome/browser/net/chrome_network_delegate.h"
(...skipping 523 matching lines...) Expand 10 before | Expand all | Expand 10 after
595 596
596 // These observers must be initialized after the profile because 597 // These observers must be initialized after the profile because
597 // they use the profile to dispatch extension events. 598 // they use the profile to dispatch extension events.
598 // 599 //
599 // Initialize the brightness observer so that we'll display an onscreen 600 // Initialize the brightness observer so that we'll display an onscreen
600 // indication of brightness changes during login. 601 // indication of brightness changes during login.
601 brightness_observer_.reset(new BrightnessObserver()); 602 brightness_observer_.reset(new BrightnessObserver());
602 output_observer_.reset(new OutputObserver()); 603 output_observer_.reset(new OutputObserver());
603 resume_observer_.reset(new ResumeObserver()); 604 resume_observer_.reset(new ResumeObserver());
604 screen_lock_observer_.reset(new ScreenLockObserver()); 605 screen_lock_observer_.reset(new ScreenLockObserver());
606 if (CommandLine::ForCurrentProcess()->HasSwitch(
607 switches::kEnableScreensaverExtensions)) {
608 screensaver_controller_.reset(new ScreensaverController());
609 }
605 suspend_observer_.reset(new SuspendObserver()); 610 suspend_observer_.reset(new SuspendObserver());
606 if (KioskModeSettings::Get()->IsKioskModeEnabled()) { 611 if (KioskModeSettings::Get()->IsKioskModeEnabled()) {
607 power_state_override_ = new PowerStateOverride( 612 power_state_override_ = new PowerStateOverride(
608 PowerStateOverride::BLOCK_DISPLAY_SLEEP); 613 PowerStateOverride::BLOCK_DISPLAY_SLEEP);
609 } 614 }
610 chromeos::accessibility::Initialize(); 615 chromeos::accessibility::Initialize();
611 616
612 removable_device_notifications_ = 617 removable_device_notifications_ =
613 new RemovableDeviceNotificationsCros(); 618 new RemovableDeviceNotificationsCros();
614 619
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
829 trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0); 834 trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0);
830 trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0); 835 trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0);
831 trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0); 836 trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0);
832 trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0); 837 trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0);
833 trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0); 838 trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0);
834 // This is necessary to start the experiment as a side effect. 839 // This is necessary to start the experiment as a side effect.
835 trial->group(); 840 trial->group();
836 } 841 }
837 842
838 } // namespace chromeos 843 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/chrome_browser_main_chromeos.h ('k') | chrome/browser/chromeos/screensaver/screensaver_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698