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

Unified Diff: chrome/browser/ui/ash/event_rewriter.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
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);
}
« no previous file with comments | « chrome/browser/ui/ash/caps_lock_delegate_chromeos.cc ('k') | chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698