Commit 04d97b52 authored by Xinghui Lu's avatar Xinghui Lu Committed by Commit Bot

Move generic interfaces to feedback module.

Move AsyncFeedbackSource.java, FeedbackSource.java and
ScreenshotSource.java from chrome/android to
chrome/browser/feedback/android.

More classes will be moved in a future CL.

Bug: 1117343
Change-Id: I618c2e0e46a265098e121a204f987bba97a674c0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2477595
Commit-Queue: Xinghui Lu <xinghuilu@chromium.org>
Reviewed-by: default avatarNatalie Chouinard <chouinard@chromium.org>
Reviewed-by: default avatarTommy Nyquist <nyquist@chromium.org>
Cr-Commit-Position: refs/heads/master@{#819033}
parent d13b189d
...@@ -810,6 +810,7 @@ junit_binary("chrome_junit_tests") { ...@@ -810,6 +810,7 @@ junit_binary("chrome_junit_tests") {
"//chrome/browser/download/android:junit_tests", "//chrome/browser/download/android:junit_tests",
"//chrome/browser/endpoint_fetcher:java", "//chrome/browser/endpoint_fetcher:java",
"//chrome/browser/enterprise/util:java", "//chrome/browser/enterprise/util:java",
"//chrome/browser/feedback/android:java",
"//chrome/browser/flags:flags_junit_tests", "//chrome/browser/flags:flags_junit_tests",
"//chrome/browser/flags:java", "//chrome/browser/flags:java",
"//chrome/browser/fullscreen/android:java", "//chrome/browser/fullscreen/android:java",
......
...@@ -691,7 +691,6 @@ chrome_java_sources = [ ...@@ -691,7 +691,6 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/feature_engagement/ScreenshotMonitorDelegate.java", "java/src/org/chromium/chrome/browser/feature_engagement/ScreenshotMonitorDelegate.java",
"java/src/org/chromium/chrome/browser/feature_engagement/ScreenshotTabObserver.java", "java/src/org/chromium/chrome/browser/feature_engagement/ScreenshotTabObserver.java",
"java/src/org/chromium/chrome/browser/feature_engagement/TrackerFactory.java", "java/src/org/chromium/chrome/browser/feature_engagement/TrackerFactory.java",
"java/src/org/chromium/chrome/browser/feedback/AsyncFeedbackSource.java",
"java/src/org/chromium/chrome/browser/feedback/AsyncFeedbackSourceAdapter.java", "java/src/org/chromium/chrome/browser/feedback/AsyncFeedbackSourceAdapter.java",
"java/src/org/chromium/chrome/browser/feedback/ChromeFeedbackCollector.java", "java/src/org/chromium/chrome/browser/feedback/ChromeFeedbackCollector.java",
"java/src/org/chromium/chrome/browser/feedback/ConnectivityChecker.java", "java/src/org/chromium/chrome/browser/feedback/ConnectivityChecker.java",
...@@ -702,7 +701,6 @@ chrome_java_sources = [ ...@@ -702,7 +701,6 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java", "java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java",
"java/src/org/chromium/chrome/browser/feedback/FeedbackContextFeedbackSource.java", "java/src/org/chromium/chrome/browser/feedback/FeedbackContextFeedbackSource.java",
"java/src/org/chromium/chrome/browser/feedback/FeedbackReporter.java", "java/src/org/chromium/chrome/browser/feedback/FeedbackReporter.java",
"java/src/org/chromium/chrome/browser/feedback/FeedbackSource.java",
"java/src/org/chromium/chrome/browser/feedback/HelpAndFeedbackLauncherImpl.java", "java/src/org/chromium/chrome/browser/feedback/HelpAndFeedbackLauncherImpl.java",
"java/src/org/chromium/chrome/browser/feedback/HistogramFeedbackSource.java", "java/src/org/chromium/chrome/browser/feedback/HistogramFeedbackSource.java",
"java/src/org/chromium/chrome/browser/feedback/IMEFeedbackSource.java", "java/src/org/chromium/chrome/browser/feedback/IMEFeedbackSource.java",
...@@ -710,7 +708,6 @@ chrome_java_sources = [ ...@@ -710,7 +708,6 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/feedback/LowEndDeviceFeedbackSource.java", "java/src/org/chromium/chrome/browser/feedback/LowEndDeviceFeedbackSource.java",
"java/src/org/chromium/chrome/browser/feedback/PermissionFeedbackSource.java", "java/src/org/chromium/chrome/browser/feedback/PermissionFeedbackSource.java",
"java/src/org/chromium/chrome/browser/feedback/ProcessIdFeedbackSource.java", "java/src/org/chromium/chrome/browser/feedback/ProcessIdFeedbackSource.java",
"java/src/org/chromium/chrome/browser/feedback/ScreenshotSource.java",
"java/src/org/chromium/chrome/browser/feedback/ScreenshotTask.java", "java/src/org/chromium/chrome/browser/feedback/ScreenshotTask.java",
"java/src/org/chromium/chrome/browser/feedback/StaticScreenshotSource.java", "java/src/org/chromium/chrome/browser/feedback/StaticScreenshotSource.java",
"java/src/org/chromium/chrome/browser/feedback/SystemInfoFeedbackSource.java", "java/src/org/chromium/chrome/browser/feedback/SystemInfoFeedbackSource.java",
......
...@@ -6,8 +6,11 @@ import("//build/config/android/rules.gni") ...@@ -6,8 +6,11 @@ import("//build/config/android/rules.gni")
android_library("java") { android_library("java") {
sources = [ sources = [
"java/src/org/chromium/chrome/browser/feedback/AsyncFeedbackSource.java",
"java/src/org/chromium/chrome/browser/feedback/FeedbackSource.java",
"java/src/org/chromium/chrome/browser/feedback/FragmentHelpAndFeedbackLauncher.java", "java/src/org/chromium/chrome/browser/feedback/FragmentHelpAndFeedbackLauncher.java",
"java/src/org/chromium/chrome/browser/feedback/HelpAndFeedbackLauncher.java", "java/src/org/chromium/chrome/browser/feedback/HelpAndFeedbackLauncher.java",
"java/src/org/chromium/chrome/browser/feedback/ScreenshotSource.java",
] ]
deps = [ deps = [
":java_resources", ":java_resources",
......
...@@ -18,12 +18,9 @@ public interface FeedbackSource { ...@@ -18,12 +18,9 @@ public interface FeedbackSource {
* Called to get all relevant feedback for this source. * Called to get all relevant feedback for this source.
* @return A map of all feedback reported by this source. * @return A map of all feedback reported by this source.
*/ */
// clang-format off
// TODO(crbug.com/781018): Clang isn't formatting this correctly.
default @Nullable Map<String, String> getFeedback() { default @Nullable Map<String, String> getFeedback() {
return null; return null;
} }
// clang-format on
/** /**
* Returns a key-value pair of logs for this source. It is appropriate to * Returns a key-value pair of logs for this source. It is appropriate to
...@@ -33,10 +30,7 @@ public interface FeedbackSource { ...@@ -33,10 +30,7 @@ public interface FeedbackSource {
* @return A key-value pair representing the logs for this source and the * @return A key-value pair representing the logs for this source and the
* identifier. * identifier.
*/ */
// clang-format off
// TODO(crbug.com/781018): Clang isn't formatting this correctly.
default @Nullable Pair<String, String> getLogs() { default @Nullable Pair<String, String> getLogs() {
return null; return null;
} }
// clang-format on
} }
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment