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

Unified Diff: ash/accelerators/accelerator_controller.cc

Issue 23904025: Move IsRunningOnChromeOS to SysInfo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge fix Created 7 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/display/display_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/accelerators/accelerator_controller.cc
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
index e0e6338c94da2d3d8ca44c7b5e990cbd9735aefe..619d5d3bf42b28332128cc8237b2c8e6c72f8576 100644
--- a/ash/accelerators/accelerator_controller.cc
+++ b/ash/accelerators/accelerator_controller.cc
@@ -70,7 +70,7 @@
#if defined(OS_CHROMEOS)
#include "ash/session_state_delegate.h"
#include "ash/system/chromeos/keyboard_brightness_controller.h"
-#include "base/chromeos/chromeos_version.h"
+#include "base/sys_info.h"
#endif // defined(OS_CHROMEOS)
namespace ash {
@@ -901,7 +901,7 @@ bool AcceleratorController::PerformAction(int action,
case POWER_PRESSED: // fallthrough
case POWER_RELEASED:
#if defined(OS_CHROMEOS)
- if (!base::chromeos::IsRunningOnChromeOS()) {
+ if (!base::SysInfo::IsRunningOnChromeOS()) {
// There is no powerd in linux desktop, so call the
// PowerButtonController here.
Shell::GetInstance()->power_button_controller()->
« no previous file with comments | « no previous file | ash/display/display_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698