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

Unified Diff: ui/aura/root_window_host_x11.cc

Issue 23904025: Move IsRunningOnChromeOS to SysInfo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . 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: ui/aura/root_window_host_x11.cc
diff --git a/ui/aura/root_window_host_x11.cc b/ui/aura/root_window_host_x11.cc
index abf1da06b9d9b20f240402b28e1c2e79fe3cd093..6eee06da0215310b2de7a04525be238b2fc17962 100644
--- a/ui/aura/root_window_host_x11.cc
+++ b/ui/aura/root_window_host_x11.cc
@@ -25,6 +25,7 @@
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
+#include "base/sys_info.h"
#include "ui/aura/client/capture_client.h"
#include "ui/aura/client/cursor_client.h"
#include "ui/aura/client/screen_position_client.h"
@@ -44,10 +45,6 @@
#include "ui/events/keycodes/keyboard_codes.h"
#include "ui/gfx/screen.h"
-#if defined(OS_CHROMEOS)
-#include "base/chromeos/chromeos_version.h"
-#endif
-
using std::max;
using std::min;
@@ -930,7 +927,7 @@ void RootWindowHostX11::DispatchXI2Event(const base::NativeEvent& event) {
}
#endif // defined(USE_XI2_MT)
#if defined(OS_CHROMEOS)
- if (base::chromeos::IsRunningOnChromeOS()) {
+ if (base::SysInfo::IsRunningOnChromeOS()) {
if (!bounds_.Contains(touchev.location()))
break;
// X maps the touch-surface to the size of the X root-window.

Powered by Google App Engine
This is Rietveld 408576698