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

Unified Diff: chrome/browser/chromeos/system/ash_system_tray_delegate.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: chrome/browser/chromeos/system/ash_system_tray_delegate.cc
diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
index ba9fe96430a9b8fe015608340b64a476c96e14bf..9b37523089214eb8a143800e1d328a5ec822b3ea 100644
--- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
+++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
@@ -35,13 +35,13 @@
#include "ash/wm/lock_state_controller.h"
#include "base/bind_helpers.h"
#include "base/callback.h"
-#include "base/chromeos/chromeos_version.h"
#include "base/command_line.h"
#include "base/logging.h"
#include "base/memory/weak_ptr.h"
#include "base/prefs/pref_service.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
+#include "base/sys_info.h"
#include "base/time/time.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chrome_notification_types.h"
@@ -504,7 +504,7 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
}
virtual bool IsOobeCompleted() const OVERRIDE {
- if (!base::chromeos::IsRunningOnChromeOS() &&
+ if (!base::SysInfo::IsRunningOnChromeOS() &&
LoginState::Get()->IsUserLoggedIn())
return true;
return StartupUtils::IsOobeCompleted();
@@ -1291,7 +1291,7 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
// Overridden from SystemKeyEventListener::CapsLockObserver.
virtual void OnCapsLockChange(bool enabled) OVERRIDE {
bool search_mapped_to_caps_lock = false;
- if (!base::chromeos::IsRunningOnChromeOS() ||
+ if (!base::SysInfo::IsRunningOnChromeOS() ||
search_key_mapped_to_ == input_method::kCapsLockKey)
search_mapped_to_caps_lock = true;
GetSystemTrayNotifier()->NotifyCapsLockChanged(

Powered by Google App Engine
This is Rietveld 408576698