chrome/browser/chromeos/app_mode/kiosk_app_update_service.cc - Issue 264743014: Move chrome.runtime to //extensions.

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/app_mode/kiosk_app_update_service.cc

Issue 264743014: Move chrome.runtime to //extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: prevent runtime impl from handling invalid update versions Created 6 years, 7 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 | « apps/shell/common/shell_extensions_client.cc ('k') | chrome/browser/extensions/api/messaging/message_property_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/app_mode/kiosk_app_update_service.cc

diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_update_service.cc b/chrome/browser/chromeos/app_mode/kiosk_app_update_service.cc

index a488b51551610b234833c5a986ba9f5bf7e48323..e6956747850bd8efe3080c80940ae44346a61319 100644

--- a/chrome/browser/chromeos/app_mode/kiosk_app_update_service.cc

+++ b/chrome/browser/chromeos/app_mode/kiosk_app_update_service.cc

@@ -10,11 +10,11 @@

#include "chrome/browser/browser_process_platform_part_chromeos.h"

#include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"

#include "chrome/browser/chromeos/system/automatic_reboot_manager.h"

-#include "chrome/browser/extensions/api/runtime/runtime_api.h"

#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/lifetime/application_lifetime.h"

#include "chrome/browser/profiles/profile.h"

#include "components/keyed_service/content/browser_context_dependency_manager.h"

+#include "extensions/browser/api/runtime/runtime_api.h"

#include "extensions/browser/extension_system.h"

#include "extensions/browser/extension_system_provider.h"

#include "extensions/browser/extensions_browser_client.h"

@@ -82,22 +82,22 @@ void KioskAppUpdateService::OnAppUpdateAvailable(

extensions::RuntimeEventRouter::DispatchOnRestartRequiredEvent(

profile_,

app_id_,

- extensions::api::runtime::OnRestartRequired::REASON_APP_UPDATE);

+ extensions::core_api::runtime::OnRestartRequired::REASON_APP_UPDATE);

StartAppUpdateRestartTimer();

}

void KioskAppUpdateService::OnRebootScheduled(Reason reason) {

- extensions::api::runtime::OnRestartRequired::Reason restart_reason =

- extensions::api::runtime::OnRestartRequired::REASON_NONE;

+ extensions::core_api::runtime::OnRestartRequired::Reason restart_reason =

+ extensions::core_api::runtime::OnRestartRequired::REASON_NONE;

switch (reason) {

case REBOOT_REASON_OS_UPDATE:

restart_reason =

- extensions::api::runtime::OnRestartRequired::REASON_OS_UPDATE;

+ extensions::core_api::runtime::OnRestartRequired::REASON_OS_UPDATE;

break;

case REBOOT_REASON_PERIODIC:

restart_reason =

- extensions::api::runtime::OnRestartRequired::REASON_PERIODIC;

+ extensions::core_api::runtime::OnRestartRequired::REASON_PERIODIC;

break;

default:

NOTREACHED() << "Unknown reboot reason=" << reason;