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

Unified Diff: chromeos/ime/xkeyboard.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 | « chromeos/ime/ibus_daemon_controller.cc ('k') | chromeos/login/login_state.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/ime/xkeyboard.cc
diff --git a/chromeos/ime/xkeyboard.cc b/chromeos/ime/xkeyboard.cc
index b73a8d1d8bb2c941a2342dded683b639c2cc4397..4c62ffbafcdb31f9d19add70b9df49d34cd8a997 100644
--- a/chromeos/ime/xkeyboard.cc
+++ b/chromeos/ime/xkeyboard.cc
@@ -10,14 +10,14 @@
#include <set>
#include <utility>
-#include "base/chromeos/chromeos_version.h"
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
-#include "base/process/process_handle.h"
#include "base/process/launch.h"
+#include "base/process/process_handle.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
+#include "base/sys_info.h"
#include "base/threading/thread_checker.h"
// These includes conflict with base/tracked_objects.h so must come last.
@@ -114,7 +114,7 @@ class XKeyboardImpl : public XKeyboard {
};
XKeyboardImpl::XKeyboardImpl()
- : is_running_on_chrome_os_(base::chromeos::IsRunningOnChromeOS()) {
+ : is_running_on_chrome_os_(base::SysInfo::IsRunningOnChromeOS()) {
num_lock_mask_ = GetNumLockMask();
// web_input_event_aurax11.cc seems to assume that Mod2Mask is always assigned
« no previous file with comments | « chromeos/ime/ibus_daemon_controller.cc ('k') | chromeos/login/login_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698