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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/views/ash/status_area_host_aura.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/ui/views/ash/caps_lock_handler.cc ('k') | chrome/browser/ui/views/ash/status_area_host_aura_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/ash/status_area_host_aura.cc
diff --git a/chrome/browser/ui/views/ash/status_area_host_aura.cc b/chrome/browser/ui/views/ash/status_area_host_aura.cc
index 8efe79daff54cbfc6437d2fb852ccf2e4292da50..d6f0d84ab3e9322357aefdf6028c92fa17fa4f8a 100644
--- a/chrome/browser/ui/views/ash/status_area_host_aura.cc
+++ b/chrome/browser/ui/views/ash/status_area_host_aura.cc
@@ -22,13 +22,13 @@
#include "ui/views/widget/widget.h"
#if defined(OS_CHROMEOS)
+#include "base/chromeos/chromeos_version.h"
#include "chrome/browser/chromeos/login/base_login_display_host.h"
#include "chrome/browser/chromeos/login/proxy_settings_dialog.h"
#include "chrome/browser/chromeos/login/screen_locker.h"
#include "chrome/browser/chromeos/login/user_manager.h"
#include "chrome/browser/chromeos/status/clock_updater.h"
#include "chrome/browser/chromeos/status/status_area_view_chromeos.h"
-#include "chrome/browser/chromeos/system/runtime_environment.h"
#include "ui/gfx/native_widget_types.h"
#endif
@@ -213,7 +213,7 @@ void StatusAreaHostAura::Observe(int type,
bool StatusAreaHostAura::IsLoginOrLockScreenDisplayed() const {
#if defined(OS_CHROMEOS)
if (!chromeos::UserManager::Get()->IsUserLoggedIn() &&
- chromeos::system::runtime_environment::IsRunningOnChromeOS())
+ base::chromeos::IsRunningOnChromeOS())
return true;
const chromeos::ScreenLocker* locker =
« no previous file with comments | « chrome/browser/ui/views/ash/caps_lock_handler.cc ('k') | chrome/browser/ui/views/ash/status_area_host_aura_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698