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

Unified Diff: chrome/browser/chromeos/system/timezone_settings.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/chromeos/system/timezone_settings.cc
diff --git a/chrome/browser/chromeos/system/timezone_settings.cc b/chrome/browser/chromeos/system/timezone_settings.cc
index 414463f660cbbdd9015711a7495f511020c8ec56..62bf1313cbbb14e3b7a943167531b0dd1d7bceb3 100644
--- a/chrome/browser/chromeos/system/timezone_settings.cc
+++ b/chrome/browser/chromeos/system/timezone_settings.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/chromeos/system/timezone_settings.h"
#include "base/bind.h"
+#include "base/chromeos/chromeos_version.h"
#include "base/file_path.h"
#include "base/file_util.h"
#include "base/logging.h"
@@ -13,7 +14,6 @@
#include "base/observer_list.h"
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
-#include "chrome/browser/chromeos/system/runtime_environment.h"
#include "content/public/browser/browser_thread.h"
using content::BrowserThread;
@@ -203,7 +203,7 @@ class TimezoneSettingsStubImpl : public TimezoneSettings {
};
TimezoneSettings* TimezoneSettings::GetInstance() {
- if (system::runtime_environment::IsRunningOnChromeOS()) {
+ if (base::chromeos::IsRunningOnChromeOS()) {
return TimezoneSettingsImpl::GetInstance();
} else {
return TimezoneSettingsStubImpl::GetInstance();
« no previous file with comments | « chrome/browser/chromeos/system/statistics_provider.cc ('k') | chrome/browser/extensions/api/terminal/terminal_private_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698