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

Unified Diff: chrome/browser/chromeos/login/chrome_restart_request.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/chromeos/login/chrome_restart_request.cc
diff --git a/chrome/browser/chromeos/login/chrome_restart_request.cc b/chrome/browser/chromeos/login/chrome_restart_request.cc
index 829ae1959a76b53cab0b8c5c2ee754a705e3b40d..659aeee698ebf4d73a810067d8cffadb60b9d6e5 100644
--- a/chrome/browser/chromeos/login/chrome_restart_request.cc
+++ b/chrome/browser/chromeos/login/chrome_restart_request.cc
@@ -7,7 +7,6 @@
#include <vector>
#include "ash/ash_switches.h"
-#include "base/chromeos/chromeos_version.h"
#include "base/command_line.h"
#include "base/memory/weak_ptr.h"
#include "base/message_loop/message_loop.h"
@@ -17,6 +16,7 @@
#include "base/process/launch.h"
#include "base/strings/string_split.h"
#include "base/strings/stringprintf.h"
+#include "base/sys_info.h"
#include "base/timer/timer.h"
#include "base/values.h"
#include "cc/base/switches.h"
@@ -358,7 +358,7 @@ void RestartChrome(const std::string& command_line) {
}
restart_requested = true;
- if (!base::chromeos::IsRunningOnChromeOS()) {
+ if (!base::SysInfo::IsRunningOnChromeOS()) {
// Relaunch chrome without session manager on dev box.
ReLaunch(command_line);
return;
« no previous file with comments | « chrome/browser/chromeos/input_method/input_method_persistence.cc ('k') | chrome/browser/chromeos/login/default_user_images.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698