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

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: Rebased 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/dbus/dbus_thread_manager.h" 16 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
17 #include "chrome/browser/chromeos/dbus/power_manager_client.h"
17 #include "chrome/browser/chromeos/dbus/session_manager_client.h" 18 #include "chrome/browser/chromeos/dbus/session_manager_client.h"
18 #include "chrome/browser/chromeos/input_method/input_method_manager.h" 19 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
19 #include "chrome/browser/chromeos/input_method/xkeyboard.h" 20 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
20 #include "chrome/browser/chromeos/login/session_manager_observer.h" 21 #include "chrome/browser/chromeos/login/session_manager_observer.h"
21 #include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h" 22 #include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h"
22 #include "chrome/browser/chromeos/net/network_change_notifier_chromeos.h" 23 #include "chrome/browser/chromeos/net/network_change_notifier_chromeos.h"
23 #include "chrome/browser/chromeos/system/runtime_environment.h" 24 #include "chrome/browser/chromeos/system/runtime_environment.h"
24 #include "chrome/browser/chromeos/system/statistics_provider.h" 25 #include "chrome/browser/chromeos/system/statistics_provider.h"
25 #include "chrome/browser/defaults.h" 26 #include "chrome/browser/defaults.h"
26 #include "chrome/common/chrome_switches.h" 27 #include "chrome/common/chrome_switches.h"
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 // the network manager. 175 // the network manager.
175 chromeos::CrosNetworkChangeNotifierFactory::GetInstance()->Init(); 176 chromeos::CrosNetworkChangeNotifierFactory::GetInstance()->Init();
176 177
177 // For http://crosbug.com/p/5795 and http://crosbug.com/p/6245. 178 // For http://crosbug.com/p/5795 and http://crosbug.com/p/6245.
178 // Enable Num Lock on X start up. 179 // Enable Num Lock on X start up.
179 if (chromeos::system::runtime_environment::IsRunningOnChromeOS()) { 180 if (chromeos::system::runtime_environment::IsRunningOnChromeOS()) {
180 chromeos::input_method::InputMethodManager::GetInstance()->GetXKeyboard()-> 181 chromeos::input_method::InputMethodManager::GetInstance()->GetXKeyboard()->
181 SetNumLockEnabled(true); 182 SetNumLockEnabled(true);
182 } 183 }
183 } 184 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698