content/browser/devtools/protocol/service_worker_handler.cc - Issue 1079923002: ServiceWorker: Stop exposing ServiceWorkerContextCore

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: content/browser/devtools/protocol/service_worker_handler.cc

Issue 1079923002: ServiceWorker: Stop exposing ServiceWorkerContextCore (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 5 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 | « content/browser/background_sync/background_sync_manager.cc ('k') | content/browser/geofencing/geofencing_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/devtools/protocol/service_worker_handler.cc

diff --git a/content/browser/devtools/protocol/service_worker_handler.cc b/content/browser/devtools/protocol/service_worker_handler.cc

index 019977215751f7270607e721f16c466f4c03afcd..6f426f4037da17c5f59d117dd3debf1e5d4d8d0a 100644

--- a/content/browser/devtools/protocol/service_worker_handler.cc

+++ b/content/browser/devtools/protocol/service_worker_handler.cc

@@ -13,7 +13,6 @@

#include "content/browser/frame_host/frame_tree.h"

#include "content/browser/frame_host/frame_tree_node.h"

#include "content/browser/frame_host/render_frame_host_impl.h"

-#include "content/browser/service_worker/service_worker_context_core.h"

#include "content/browser/service_worker/service_worker_context_watcher.h"

#include "content/browser/service_worker/service_worker_context_wrapper.h"

#include "content/browser/service_worker/service_worker_version.h"

@@ -151,11 +150,8 @@ bool CollectURLs(std::set<GURL>* urls, FrameTreeNode* tree_node) {

void StopServiceWorkerOnIO(scoped_refptr<ServiceWorkerContextWrapper> context,

int64 version_id) {

- ServiceWorkerContextCore* context_core = context->context();

- if (!context_core)

- return;

if (content::ServiceWorkerVersion* version =

- context_core->GetLiveVersion(version_id)) {

+ context->GetLiveVersion(version_id)) {

version->StopWorker(base::Bind(&StatusNoOp));

}

@@ -164,11 +160,8 @@ void GetDevToolsRouteInfoOnIO(

scoped_refptr<ServiceWorkerContextWrapper> context,

int64 version_id,

const base::Callback<void(int, int)>& callback) {

- ServiceWorkerContextCore* context_core = context->context();

- if (!context_core)

- return;

if (content::ServiceWorkerVersion* version =

- context_core->GetLiveVersion(version_id)) {

+ context->GetLiveVersion(version_id)) {

BrowserThread::PostTask(

BrowserThread::UI, FROM_HERE,

base::Bind(

« no previous file with comments | « content/browser/background_sync/background_sync_manager.cc ('k') | content/browser/geofencing/geofencing_manager.cc » ('j') | no next file with comments »