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

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

Issue 8356040: Reapply Caps Lock and Num Lock to core keyboard whenever new X input device is added (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix unit_tests 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 | Annotate | Revision Log
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/session_manager_client.h" 17 #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/xkeyboard.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/net/network_change_notifier_chromeos.h" 22 #include "chrome/browser/chromeos/net/network_change_notifier_chromeos.h"
23 #include "chrome/browser/chromeos/system/runtime_environment.h"
21 #include "chrome/browser/chromeos/system/statistics_provider.h" 24 #include "chrome/browser/chromeos/system/statistics_provider.h"
22 #include "chrome/browser/defaults.h" 25 #include "chrome/browser/defaults.h"
23 #include "chrome/common/chrome_switches.h" 26 #include "chrome/common/chrome_switches.h"
24 #include "content/public/common/main_function_params.h" 27 #include "content/public/common/main_function_params.h"
25 #include "net/base/network_change_notifier.h" 28 #include "net/base/network_change_notifier.h"
26 29
27 #if defined(TOOLKIT_USES_GTK) 30 #if defined(TOOLKIT_USES_GTK)
28 #include <gtk/gtk.h> 31 #include <gtk/gtk.h>
29 #endif 32 #endif
30 33
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 160
158 // Initialize the Chrome OS bluetooth subsystem 161 // Initialize the Chrome OS bluetooth subsystem
159 if (parsed_command_line().HasSwitch(switches::kEnableBluetooth)) { 162 if (parsed_command_line().HasSwitch(switches::kEnableBluetooth)) {
160 chromeos::BluetoothManager::Initialize(); 163 chromeos::BluetoothManager::Initialize();
161 } 164 }
162 165
163 // Initialize the network change notifier for Chrome OS. The network 166 // Initialize the network change notifier for Chrome OS. The network
164 // change notifier starts to monitor changes from the power manager and 167 // change notifier starts to monitor changes from the power manager and
165 // the network manager. 168 // the network manager.
166 chromeos::CrosNetworkChangeNotifierFactory::GetInstance()->Init(); 169 chromeos::CrosNetworkChangeNotifierFactory::GetInstance()->Init();
170
171 // For http://crosbug.com/p/5795 and http://crosbug.com/p/6245.
172 // Enable Num Lock on X start up.
173 if (chromeos::system::runtime_environment::IsRunningOnChromeOS()) {
174 chromeos::input_method::InputMethodManager::GetInstance()->GetXKeyboard()->
175 SetNumLockEnabled(true);
176 }
167 } 177 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698