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

Unified Diff: chrome/browser/chromeos/status/caps_lock_menu_button.cc

Issue 9546013: Move IsRunningOnChromeOS to base/chromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chromeos_version,sync,cleanup Created 8 years, 9 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 | « chrome/browser/chromeos/preferences.cc ('k') | chrome/browser/chromeos/status/volume_menu_button.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/status/caps_lock_menu_button.cc
diff --git a/chrome/browser/chromeos/status/caps_lock_menu_button.cc b/chrome/browser/chromeos/status/caps_lock_menu_button.cc
index cd22109bbdfdbbfd796065de6ca0882e7bbff779..3d69e9206d111040e8a001487cd2b2ef2aff5f4c 100644
--- a/chrome/browser/chromeos/status/caps_lock_menu_button.cc
+++ b/chrome/browser/chromeos/status/caps_lock_menu_button.cc
@@ -6,13 +6,13 @@
#include <string>
+#include "base/chromeos/chromeos_version.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/chromeos/input_method/input_method_manager.h"
#include "chrome/browser/chromeos/input_method/xkeyboard.h"
#include "chrome/browser/chromeos/login/screen_locker.h"
#include "chrome/browser/chromeos/status/status_area_bubble.h"
#include "chrome/browser/chromeos/status/status_area_view_chromeos.h"
-#include "chrome/browser/chromeos/system/runtime_environment.h"
#include "chrome/browser/chromeos/view_ids.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile_manager.h"
@@ -79,7 +79,7 @@ CapsLockMenuButton::CapsLockMenuButton(StatusAreaButton::Delegate* delegate)
// device. SystemKeyEventListener is never initialized on chrome for cros
// running on linux.
DCHECK(SystemKeyEventListener::GetInstance() ||
- !system::runtime_environment::IsRunningOnChromeOS());
+ !base::chromeos::IsRunningOnChromeOS());
if (SystemKeyEventListener::GetInstance())
SystemKeyEventListener::GetInstance()->AddCapsLockObserver(this);
@@ -268,7 +268,7 @@ void CapsLockMenuButton::HideBubble() {
bool CapsLockMenuButton::HasCapsLock() const {
// A keyboard for Linux usually has Caps Lock.
- if (!system::runtime_environment::IsRunningOnChromeOS())
+ if (!base::chromeos::IsRunningOnChromeOS())
return true;
// On the login screen, Caps Lock is not available.
if (!initialized_prefs_)
« no previous file with comments | « chrome/browser/chromeos/preferences.cc ('k') | chrome/browser/chromeos/status/volume_menu_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698