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

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

Issue 189663009: cros: Simplify chromeos::input_method::XKeyboard interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 9 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/ash_switches.h" 10 #include "ash/ash_switches.h"
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 // change notifier starts to monitor changes from the power manager and 291 // change notifier starts to monitor changes from the power manager and
292 // the network manager. 292 // the network manager.
293 NetworkChangeNotifierFactoryChromeos::GetInstance()->Initialize(); 293 NetworkChangeNotifierFactoryChromeos::GetInstance()->Initialize();
294 294
295 // Likewise, initialize the upgrade detector for Chrome OS. The upgrade 295 // Likewise, initialize the upgrade detector for Chrome OS. The upgrade
296 // detector starts to monitor changes from the update engine. 296 // detector starts to monitor changes from the update engine.
297 UpgradeDetectorChromeos::GetInstance()->Init(); 297 UpgradeDetectorChromeos::GetInstance()->Init();
298 298
299 if (base::SysInfo::IsRunningOnChromeOS()) { 299 if (base::SysInfo::IsRunningOnChromeOS()) {
300 // Disable Num Lock on X start up for http://crosbug.com/29169. 300 // Disable Num Lock on X start up for http://crosbug.com/29169.
301 input_method::InputMethodManager::Get()->GetXKeyboard()-> 301 input_method::InputMethodManager::Get()->GetXKeyboard()->DisableNumLock();
302 SetNumLockEnabled(false);
303 } 302 }
304 303
305 // Initialize the device settings service so that we'll take actions per 304 // Initialize the device settings service so that we'll take actions per
306 // signals sent from the session manager. This needs to happen before 305 // signals sent from the session manager. This needs to happen before
307 // g_browser_process initializes BrowserPolicyConnector. 306 // g_browser_process initializes BrowserPolicyConnector.
308 DeviceSettingsService::Initialize(); 307 DeviceSettingsService::Initialize();
309 DeviceSettingsService::Get()->SetSessionManager( 308 DeviceSettingsService::Get()->SetSessionManager(
310 DBusThreadManager::Get()->GetSessionManagerClient(), 309 DBusThreadManager::Get()->GetSessionManagerClient(),
311 OwnerKeyUtil::Create()); 310 OwnerKeyUtil::Create());
312 } 311 }
(...skipping 526 matching lines...) Expand 10 before | Expand all | Expand 10 after
839 // Destroy DBus services immediately after threads are stopped. 838 // Destroy DBus services immediately after threads are stopped.
840 dbus_services_.reset(); 839 dbus_services_.reset();
841 840
842 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 841 ChromeBrowserMainPartsLinux::PostDestroyThreads();
843 842
844 // Destroy DeviceSettingsService after g_browser_process. 843 // Destroy DeviceSettingsService after g_browser_process.
845 DeviceSettingsService::Shutdown(); 844 DeviceSettingsService::Shutdown();
846 } 845 }
847 846
848 } // namespace chromeos 847 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/events/system_key_event_listener.h » ('j') | chromeos/ime/xkeyboard.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698