chrome/browser/chromeos/system/automatic_reboot_manager.cc - Issue 14192016: Move OS_CHROMEOS-specific paths to chromeos/chromeos_paths.cc.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/system/automatic_reboot_manager.cc

Issue 14192016: Move OS_CHROMEOS-specific paths to chromeos/chromeos_paths.cc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 8 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/chromeos/settings/owner_key_util.cc ('k') | chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc » ('j') | chrome/common/chrome_paths.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/system/automatic_reboot_manager.cc

diff --git a/chrome/browser/chromeos/system/automatic_reboot_manager.cc b/chrome/browser/chromeos/system/automatic_reboot_manager.cc

index 5bf66e7bf60612940ed72323ea52a8c7f2952d4a..8c1aadfa4c920136c0299bcd97c67558e0685421 100644

--- a/chrome/browser/chromeos/system/automatic_reboot_manager.cc

+++ b/chrome/browser/chromeos/system/automatic_reboot_manager.cc

@@ -28,8 +28,8 @@

#include "chrome/browser/browser_process.h"

#include "chrome/browser/chromeos/login/user_manager.h"

#include "chrome/common/chrome_notification_types.h"

-#include "chrome/common/chrome_paths.h"

#include "chrome/common/pref_names.h"

+#include "chromeos/chromeos_paths.h"

#include "chromeos/chromeos_switches.h"

#include "chromeos/dbus/dbus_thread_manager.h"

#include "content/public/browser/browser_thread.h"

@@ -63,9 +63,9 @@ void GetSystemEventTimes(

base::Callback<void(

const AutomaticRebootManager::SystemEventTimes&)> reply) {

base::FilePath uptime_file;

- CHECK(PathService::Get(chrome::FILE_UPTIME, &uptime_file));

+ CHECK(PathService::Get(chromeos::FILE_UPTIME, &uptime_file));

base::FilePath update_reboot_needed_uptime_file;

- CHECK(PathService::Get(chrome::FILE_UPDATE_REBOOT_NEEDED_UPTIME,

+ CHECK(PathService::Get(chromeos::FILE_UPDATE_REBOOT_NEEDED_UPTIME,

&update_reboot_needed_uptime_file));

reply_task_runner->PostTask(FROM_HERE, base::Bind(reply,

AutomaticRebootManager::SystemEventTimes(

@@ -77,7 +77,7 @@ void SaveUpdateRebootNeededUptime() {

const base::TimeDelta kZeroTimeDelta;

base::FilePath update_reboot_needed_uptime_file;

- CHECK(PathService::Get(chrome::FILE_UPDATE_REBOOT_NEEDED_UPTIME,

+ CHECK(PathService::Get(chromeos::FILE_UPDATE_REBOOT_NEEDED_UPTIME,

&update_reboot_needed_uptime_file));

const base::TimeDelta last_update_reboot_needed_uptime =

ReadTimeDeltaFromFile(update_reboot_needed_uptime_file);

@@ -85,7 +85,7 @@ void SaveUpdateRebootNeededUptime() {

return;

base::FilePath uptime_file;

- CHECK(PathService::Get(chrome::FILE_UPTIME, &uptime_file));

+ CHECK(PathService::Get(chromeos::FILE_UPTIME, &uptime_file));

const base::TimeDelta uptime = ReadTimeDeltaFromFile(uptime_file);

if (uptime == kZeroTimeDelta)

return;