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

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

Issue 8271024: chromeos: Add power supply info reading capability (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: removed #if 0 Created 9 years, 1 month 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/command_line.h" 9 #include "base/command_line.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
11 #include "base/message_loop.h" 11 #include "base/message_loop.h"
12 #include "chrome/browser/chromeos/bluetooth/bluetooth_manager.h" 12 #include "chrome/browser/chromeos/bluetooth/bluetooth_manager.h"
13 #include "chrome/browser/chromeos/boot_times_loader.h" 13 #include "chrome/browser/chromeos/boot_times_loader.h"
14 #include "chrome/browser/chromeos/brightness_observer.h" 14 #include "chrome/browser/chromeos/brightness_observer.h"
15 #include "chrome/browser/chromeos/cros/cros_library.h" 15 #include "chrome/browser/chromeos/cros/cros_library.h"
16 #include "chrome/browser/chromeos/cros/power_library.h"
satorux1 2011/10/28 17:36:23 Do we need this?
Simon Que 2011/10/29 02:20:11 Done.
16 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h" 17 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
18 #include "chrome/browser/chromeos/dbus/power_manager_client.h"
17 #include "chrome/browser/chromeos/dbus/session_manager_client.h" 19 #include "chrome/browser/chromeos/dbus/session_manager_client.h"
18 #include "chrome/browser/chromeos/login/session_manager_observer.h" 20 #include "chrome/browser/chromeos/login/session_manager_observer.h"
19 #include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h" 21 #include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h"
20 #include "chrome/browser/chromeos/system/statistics_provider.h" 22 #include "chrome/browser/chromeos/system/statistics_provider.h"
21 #include "chrome/browser/defaults.h" 23 #include "chrome/browser/defaults.h"
22 #include "chrome/common/chrome_switches.h" 24 #include "chrome/common/chrome_switches.h"
23 #include "content/common/main_function_params.h" 25 #include "content/common/main_function_params.h"
24 #include "net/base/network_change_notifier.h" 26 #include "net/base/network_change_notifier.h"
25 27
26 #if defined(TOOLKIT_USES_GTK) 28 #if defined(TOOLKIT_USES_GTK)
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 void ChromeBrowserMainPartsChromeos::PostMainMessageLoopStart() { 139 void ChromeBrowserMainPartsChromeos::PostMainMessageLoopStart() {
138 ChromeBrowserMainPartsPosix::PostMainMessageLoopStart(); 140 ChromeBrowserMainPartsPosix::PostMainMessageLoopStart();
139 MessageLoopForUI* message_loop = MessageLoopForUI::current(); 141 MessageLoopForUI* message_loop = MessageLoopForUI::current();
140 message_loop->AddObserver(g_message_loop_observer.Pointer()); 142 message_loop->AddObserver(g_message_loop_observer.Pointer());
141 143
142 // Initialize DBusThreadManager for the browser. This must be done after 144 // Initialize DBusThreadManager for the browser. This must be done after
143 // the main message loop is started, as it uses the message loop. 145 // the main message loop is started, as it uses the message loop.
144 chromeos::DBusThreadManager::Initialize(); 146 chromeos::DBusThreadManager::Initialize();
145 147
146 // Initialize the brightness observer so that we'll display an onscreen 148 // Initialize the brightness observer so that we'll display an onscreen
147 // indication of brightness changes during login. 149 // indication of brightness changes.
148 brightness_observer_.reset(new chromeos::BrightnessObserver()); 150 brightness_observer_.reset(new chromeos::BrightnessObserver());
149 chromeos::DBusThreadManager::Get()->power_manager_client()->AddObserver( 151 chromeos::DBusThreadManager::Get()->power_manager_client()->AddObserver(
150 brightness_observer_.get()); 152 brightness_observer_.get());
153
151 // Initialize the session manager observer so that we'll take actions 154 // Initialize the session manager observer so that we'll take actions
152 // per signals sent from the session manager. 155 // per signals sent from the session manager.
153 session_manager_observer_.reset(new chromeos::SessionManagerObserver); 156 session_manager_observer_.reset(new chromeos::SessionManagerObserver);
154 chromeos::DBusThreadManager::Get()->session_manager_client()-> 157 chromeos::DBusThreadManager::Get()->session_manager_client()->
155 AddObserver(session_manager_observer_.get()); 158 AddObserver(session_manager_observer_.get());
156 159
157 // Initialize the Chrome OS bluetooth subsystem 160 // Initialize the Chrome OS bluetooth subsystem
158 if (parsed_command_line().HasSwitch(switches::kEnableBluetooth)) { 161 if (parsed_command_line().HasSwitch(switches::kEnableBluetooth)) {
159 chromeos::BluetoothManager::Initialize(); 162 chromeos::BluetoothManager::Initialize();
160 } 163 }
161 } 164 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698