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

Unified Diff: chrome/browser/ui/webui/flags_ui.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
Index: chrome/browser/ui/webui/flags_ui.cc
diff --git a/chrome/browser/ui/webui/flags_ui.cc b/chrome/browser/ui/webui/flags_ui.cc
index 599a771c79cd0739f29015a8a8fc6a123dfa0580..ff511a7ac9580e138697662bd4d287c251383f1a 100644
--- a/chrome/browser/ui/webui/flags_ui.cc
+++ b/chrome/browser/ui/webui/flags_ui.cc
@@ -30,9 +30,9 @@
#include "ui/base/resource/resource_bundle.h"
#if defined(OS_CHROMEOS)
+#include "base/chromeos/chromeos_version.h"
#include "chrome/browser/chromeos/cros_settings.h"
#include "chrome/browser/chromeos/login/user_manager.h"
-#include "chrome/browser/chromeos/system/runtime_environment.h"
#endif
using content::WebContents;
@@ -69,7 +69,7 @@ ChromeWebUIDataSource* CreateFlagsUIHTMLSource() {
int idr = IDR_FLAGS_HTML;
#if defined (OS_CHROMEOS)
if (!chromeos::UserManager::Get()->IsCurrentUserOwner() &&
- chromeos::system::runtime_environment::IsRunningOnChromeOS())
+ base::chromeos::IsRunningOnChromeOS())
idr = IDR_FLAGS_HTML_WARNING;
#endif
source->set_default_resource(idr);

Powered by Google App Engine
This is Rietveld 408576698