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

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

Issue 10263011: chromeos: Add support for dimming the screen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test Created 8 years, 7 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 "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/chromeos/chromeos_version.h" 9 #include "base/chromeos/chromeos_version.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 22 matching lines...) Expand all
33 #include "chrome/browser/chromeos/login/screen_locker.h" 33 #include "chrome/browser/chromeos/login/screen_locker.h"
34 #include "chrome/browser/chromeos/login/session_manager_observer.h" 34 #include "chrome/browser/chromeos/login/session_manager_observer.h"
35 #include "chrome/browser/chromeos/login/user_manager.h" 35 #include "chrome/browser/chromeos/login/user_manager.h"
36 #include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h" 36 #include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h"
37 #include "chrome/browser/chromeos/net/network_change_notifier_chromeos.h" 37 #include "chrome/browser/chromeos/net/network_change_notifier_chromeos.h"
38 #include "chrome/browser/chromeos/power/brightness_observer.h" 38 #include "chrome/browser/chromeos/power/brightness_observer.h"
39 #include "chrome/browser/chromeos/power/power_button_controller_delegate_chromeo s.h" 39 #include "chrome/browser/chromeos/power/power_button_controller_delegate_chromeo s.h"
40 #include "chrome/browser/chromeos/power/power_button_observer.h" 40 #include "chrome/browser/chromeos/power/power_button_observer.h"
41 #include "chrome/browser/chromeos/power/power_state_override.h" 41 #include "chrome/browser/chromeos/power/power_state_override.h"
42 #include "chrome/browser/chromeos/power/resume_observer.h" 42 #include "chrome/browser/chromeos/power/resume_observer.h"
43 #include "chrome/browser/chromeos/power/screen_dimming_observer.h"
43 #include "chrome/browser/chromeos/power/screen_lock_observer.h" 44 #include "chrome/browser/chromeos/power/screen_lock_observer.h"
44 #include "chrome/browser/chromeos/power/video_property_writer.h" 45 #include "chrome/browser/chromeos/power/video_property_writer.h"
45 #include "chrome/browser/chromeos/system/statistics_provider.h" 46 #include "chrome/browser/chromeos/system/statistics_provider.h"
46 #include "chrome/browser/chromeos/system_key_event_listener.h" 47 #include "chrome/browser/chromeos/system_key_event_listener.h"
47 #include "chrome/browser/chromeos/upgrade_detector_chromeos.h" 48 #include "chrome/browser/chromeos/upgrade_detector_chromeos.h"
48 #include "chrome/browser/chromeos/web_socket_proxy_controller.h" 49 #include "chrome/browser/chromeos/web_socket_proxy_controller.h"
49 #include "chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h" 50 #include "chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h"
50 #include "chrome/browser/defaults.h" 51 #include "chrome/browser/defaults.h"
51 #include "chrome/browser/metrics/metrics_service.h" 52 #include "chrome/browser/metrics/metrics_service.h"
52 #include "chrome/browser/oom_priority_manager.h" 53 #include "chrome/browser/oom_priority_manager.h"
(...skipping 10 matching lines...) Expand all
63 #include "chromeos/dbus/dbus_thread_manager.h" 64 #include "chromeos/dbus/dbus_thread_manager.h"
64 #include "chromeos/dbus/power_manager_client.h" 65 #include "chromeos/dbus/power_manager_client.h"
65 #include "chromeos/dbus/session_manager_client.h" 66 #include "chromeos/dbus/session_manager_client.h"
66 #include "content/public/browser/notification_service.h" 67 #include "content/public/browser/notification_service.h"
67 #include "content/public/common/main_function_params.h" 68 #include "content/public/common/main_function_params.h"
68 #include "grit/platform_locale_settings.h" 69 #include "grit/platform_locale_settings.h"
69 #include "net/base/network_change_notifier.h" 70 #include "net/base/network_change_notifier.h"
70 #include "net/url_request/url_request.h" 71 #include "net/url_request/url_request.h"
71 #include "ui/base/l10n/l10n_util.h" 72 #include "ui/base/l10n/l10n_util.h"
72 73
73
74
75 class MessageLoopObserver : public MessageLoopForUI::Observer { 74 class MessageLoopObserver : public MessageLoopForUI::Observer {
76 virtual base::EventStatus WillProcessEvent( 75 virtual base::EventStatus WillProcessEvent(
77 const base::NativeEvent& event) OVERRIDE { 76 const base::NativeEvent& event) OVERRIDE {
78 return base::EVENT_CONTINUE; 77 return base::EVENT_CONTINUE;
79 } 78 }
80 79
81 virtual void DidProcessEvent( 80 virtual void DidProcessEvent(
82 const base::NativeEvent& event) OVERRIDE { 81 const base::NativeEvent& event) OVERRIDE {
83 } 82 }
84 }; 83 };
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
432 // FILE thread is created in ChromeBrowserMainParts::PreMainMessageLoopRun(). 431 // FILE thread is created in ChromeBrowserMainParts::PreMainMessageLoopRun().
433 432
434 // Get the statistics provider instance here to start loading statistcs 433 // Get the statistics provider instance here to start loading statistcs
435 // on the background FILE thread. 434 // on the background FILE thread.
436 chromeos::system::StatisticsProvider::GetInstance(); 435 chromeos::system::StatisticsProvider::GetInstance();
437 436
438 // These are dependent on the ash::Shell singleton already having been 437 // These are dependent on the ash::Shell singleton already having been
439 // initialized. 438 // initialized.
440 power_button_observer_.reset(new chromeos::PowerButtonObserver); 439 power_button_observer_.reset(new chromeos::PowerButtonObserver);
441 video_property_writer_.reset(new chromeos::VideoPropertyWriter); 440 video_property_writer_.reset(new chromeos::VideoPropertyWriter);
441 screen_dimming_observer_.reset(new chromeos::ScreenDimmingObserver);
442 442
443 ChromeBrowserMainPartsLinux::PostBrowserStart(); 443 ChromeBrowserMainPartsLinux::PostBrowserStart();
444 } 444 }
445 445
446 // Shut down services before the browser process, etc are destroyed. 446 // Shut down services before the browser process, etc are destroyed.
447 void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() { 447 void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
448 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("UIMessageLoopEnded", 448 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("UIMessageLoopEnded",
449 true); 449 true);
450 450
451 g_browser_process->oom_priority_manager()->Stop(); 451 g_browser_process->oom_priority_manager()->Stop();
(...skipping 29 matching lines...) Expand all
481 // even if Initialize() wasn't called. 481 // even if Initialize() wasn't called.
482 chromeos::SystemKeyEventListener::Shutdown(); 482 chromeos::SystemKeyEventListener::Shutdown();
483 chromeos::imageburner::BurnManager::Shutdown(); 483 chromeos::imageburner::BurnManager::Shutdown();
484 chromeos::AudioHandler::Shutdown(); 484 chromeos::AudioHandler::Shutdown();
485 485
486 chromeos::WebSocketProxyController::Shutdown(); 486 chromeos::WebSocketProxyController::Shutdown();
487 487
488 // Let VideoPropertyWriter unregister itself as an observer of the ash::Shell 488 // Let VideoPropertyWriter unregister itself as an observer of the ash::Shell
489 // singleton before the shell is destroyed. 489 // singleton before the shell is destroyed.
490 video_property_writer_.reset(); 490 video_property_writer_.reset();
491 // Remove PowerButtonObserver attached to a D-Bus client before 491
492 // DBusThreadManager is shut down. 492 // Detach D-Bus clients before DBusThreadManager is shut down.
493 power_button_observer_.reset(); 493 power_button_observer_.reset();
494 screen_dimming_observer_.reset();
494 495
495 ChromeBrowserMainPartsLinux::PostMainMessageLoopRun(); 496 ChromeBrowserMainPartsLinux::PostMainMessageLoopRun();
496 } 497 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/chrome_browser_main_chromeos.h ('k') | chrome/browser/chromeos/power/screen_dimming_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698