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

Unified Diff: chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.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
Index: chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc
diff --git a/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc b/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc
index d7ee7f7a1d4a4040bab054135e7aaeeedd9b5c7a..bc580cc7e6b35b3c84f5a2c24b5e11255f011cf2 100644
--- a/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc
+++ b/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc
@@ -10,9 +10,9 @@
#include <vector>
#include "base/bind.h"
-#include "base/chromeos/chromeos_version.h"
#include "base/command_line.h"
#include "base/memory/scoped_ptr.h"
+#include "base/sys_info.h"
#include "base/values.h"
#include "chrome/browser/chromeos/login/user_manager.h"
#include "chrome/browser/chromeos/settings/cros_settings.h"
@@ -199,7 +199,7 @@ void KioskAppsHandler::OnGetConsumerKioskModeStatus(
is_kiosk_enabled_ =
((status == KioskAppManager::CONSUMER_KIOSK_MODE_ENABLED) &&
chromeos::UserManager::Get()->IsCurrentUserOwner()) ||
- !base::chromeos::IsRunningOnChromeOS();
+ !base::SysInfo::IsRunningOnChromeOS();
if (is_kiosk_enabled_) {
base::FundamentalValue enabled(is_kiosk_enabled_);
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc ('k') | chrome/browser/ui/webui/flags_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698