chrome/browser/android/offline_pages/background_scheduler_bridge.cc - Issue 2064323004: Defines initial DeviceConditions and and plumbs down through StartProcessing() call.

Unified Diff: chrome/browser/android/offline_pages/background_scheduler_bridge.cc

Issue 2064323004: Defines initial DeviceConditions and and plumbs down through StartProcessing() call. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Merge Created 4 years, 6 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

« chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/StubBackgroundSchedulerProcessor.java ('K') | « chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/StubBackgroundSchedulerProcessor.java ('k') | components/offline_pages.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 5b8fcbafbd9bf8aeddea80620b92ea78d6e12886..4e4de65f8c45265913317e3c5e859db3bef98baa 100644

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

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

@@ -9,6 +9,7 @@

#include "chrome/browser/android/offline_pages/request_coordinator_factory.h"

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

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

+#include "components/offline_pages/background/device_conditions.h"

#include "components/offline_pages/background/request_coordinator.h"

#include "jni/BackgroundSchedulerBridge_jni.h"

@@ -28,10 +29,12 @@ void ProcessingDoneCallback(

} // namespace

// JNI call to start request processing.

-static jboolean StartProcessing(

- JNIEnv* env,

- const JavaParamRef<jclass>& jcaller,

- const JavaParamRef<jobject>& j_callback_obj) {

+static jboolean StartProcessing(JNIEnv* env,

+ const JavaParamRef<jclass>& jcaller,

+ const jboolean j_power_connected,

+ const jint j_battery_percentage,

+ const jint j_net_connection_type,

+ const JavaParamRef<jobject>& j_callback_obj) {

ScopedJavaGlobalRef<jobject> j_callback_ref;

j_callback_ref.Reset(env, j_callback_obj);

@@ -42,14 +45,12 @@ static jboolean StartProcessing(

RequestCoordinatorFactory::GetInstance()->

GetForBrowserContext(profile);

DVLOG(2) << "resource_coordinator: " << coordinator;

- coordinator->StartProcessing(

- base::Bind(&ProcessingDoneCallback, j_callback_ref));

- base::Bind(&ProcessingDoneCallback, j_callback_ref);

- // TODO(dougarnett): lookup/create RequestCoordinator KeyedService

- // and call StartProcessing on it with bound j_callback_obj.

- return false;

+ DeviceConditions device_conditions(

+ j_power_connected, j_battery_percentage,

Pete Williamson 2016/06/16 17:46:26 Do these j_ types convert seamlessly and properly

dougarnett 2016/06/16 21:03:07 Doc: http://docs.oracle.com/javase/7/docs/technote

+ static_cast<net::NetworkChangeNotifier::ConnectionType>(

Pete Williamson 2016/06/16 17:46:26 Is this cast safe? (ie, are we guaranteed the enu

dougarnett 2016/06/16 21:03:07 This reference generated java org.chromium.net.Con

Pete Williamson 2016/06/16 22:43:57 Ah, I didn't notice that it was from webrtc, I tho

+ j_net_connection_type));

+ return coordinator->StartProcessing(

+ device_conditions, base::Bind(&ProcessingDoneCallback, j_callback_ref));

}

void BackgroundSchedulerBridge::Schedule(