| Index: chrome/browser/ui/ash/event_rewriter.cc
|
| diff --git a/chrome/browser/ui/ash/event_rewriter.cc b/chrome/browser/ui/ash/event_rewriter.cc
|
| index f80b08dfff6744843661c88e8ea7a92085b1ab16..344821d79ce6b8f9246ff9b0eb1b377aa21783c2 100644
|
| --- a/chrome/browser/ui/ash/event_rewriter.cc
|
| +++ b/chrome/browser/ui/ash/event_rewriter.cc
|
| @@ -25,8 +25,8 @@
|
| // Get rid of a macro from Xlib.h that conflicts with OwnershipService class.
|
| #undef Status
|
|
|
| -#include "base/chromeos/chromeos_version.h"
|
| #include "base/command_line.h"
|
| +#include "base/sys_info.h"
|
| #include "chrome/browser/chromeos/keyboard_driven_event_rewriter.h"
|
| #include "chrome/browser/chromeos/login/login_display_host_impl.h"
|
| #include "chrome/browser/chromeos/login/user_manager.h"
|
| @@ -156,7 +156,7 @@ EventRewriter::EventRewriter()
|
| if (ash::Shell::HasInstance())
|
| ash::Shell::GetPrimaryRootWindow()->AddRootWindowObserver(this);
|
| #if defined(OS_CHROMEOS)
|
| - if (base::chromeos::IsRunningOnChromeOS()) {
|
| + if (base::SysInfo::IsRunningOnChromeOS()) {
|
| chromeos::XInputHierarchyChangedEventListener::GetInstance()
|
| ->AddObserver(this);
|
| }
|
| @@ -168,7 +168,7 @@ EventRewriter::~EventRewriter() {
|
| if (ash::Shell::HasInstance())
|
| ash::Shell::GetPrimaryRootWindow()->RemoveRootWindowObserver(this);
|
| #if defined(OS_CHROMEOS)
|
| - if (base::chromeos::IsRunningOnChromeOS()) {
|
| + if (base::SysInfo::IsRunningOnChromeOS()) {
|
| chromeos::XInputHierarchyChangedEventListener::GetInstance()
|
| ->RemoveObserver(this);
|
| }
|
|
|