chrome/browser/android/offline_pages/offline_page_bridge.cc - Issue 2714693003: [Offline Pages] Resume pending requests when chrome starts.

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/android/offline_pages/offline_page_bridge.cc

Issue 2714693003: [Offline Pages] Resume pending requests when chrome starts. (Closed)

Patch Set: Fixing merging. Created 3 years, 10 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:

Index: chrome/browser/android/offline_pages/offline_page_bridge.cc

diff --git a/chrome/browser/android/offline_pages/offline_page_bridge.cc b/chrome/browser/android/offline_pages/offline_page_bridge.cc

index 15bef35435b9f7eea105177292f9610048324f80..0996153dced91f36db82d2edd38869d9957186ed 100644

--- a/chrome/browser/android/offline_pages/offline_page_bridge.cc

+++ b/chrome/browser/android/offline_pages/offline_page_bridge.cc

@@ -623,7 +623,6 @@ void OfflinePageBridge::NotifyIfDoneLoading() const {

Java_OfflinePageBridge_offlinePageModelLoaded(env, java_ref_);

}

fgorski 2017/03/03 17:44:37 I'd skip changing this file for a simpler merge, i

ScopedJavaLocalRef<jobject> OfflinePageBridge::CreateClientId(

JNIEnv* env,

const ClientId& client_id) const {