Commit fe95067c authored by Kyle Milka's avatar Kyle Milka Committed by Commit Bot

Move EditorScreenshot* files

Move a few of the editor screenshot files into c/b/share/.

This eliminates the DEPS on those files.

Bug: 1022172
Change-Id: Ibe12b1d4aadae983d74e348ea5279af4230610eb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2481928Reviewed-by: default avatarJeffrey Cohen <jeffreycohen@chromium.org>
Reviewed-by: default avatarTheresa  <twellington@chromium.org>
Reviewed-by: default avatarDavid Trainor <dtrainor@chromium.org>
Commit-Queue: Kyle Milka <kmilka@chromium.org>
Cr-Commit-Position: refs/heads/master@{#821274}
parent 683ceb19
...@@ -3330,7 +3330,6 @@ generate_jni("chrome_jni_headers") { ...@@ -3330,7 +3330,6 @@ generate_jni("chrome_jni_headers") {
"java/src/org/chromium/chrome/browser/rlz/RlzPingHandler.java", "java/src/org/chromium/chrome/browser/rlz/RlzPingHandler.java",
"java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingPasswordReuseDialogBridge.java", "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingPasswordReuseDialogBridge.java",
"java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingSettingsLauncher.java", "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingSettingsLauncher.java",
"java/src/org/chromium/chrome/browser/screenshot/EditorScreenshotTask.java",
"java/src/org/chromium/chrome/browser/search_engines/TemplateUrlServiceFactory.java", "java/src/org/chromium/chrome/browser/search_engines/TemplateUrlServiceFactory.java",
"java/src/org/chromium/chrome/browser/sharing/SharingJNIBridge.java", "java/src/org/chromium/chrome/browser/sharing/SharingJNIBridge.java",
"java/src/org/chromium/chrome/browser/sharing/SharingServiceProxy.java", "java/src/org/chromium/chrome/browser/sharing/SharingServiceProxy.java",
......
...@@ -1342,8 +1342,6 @@ chrome_java_sources = [ ...@@ -1342,8 +1342,6 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingPasswordReuseDialogBridge.java", "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingPasswordReuseDialogBridge.java",
"java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingSettingsLauncher.java", "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingSettingsLauncher.java",
"java/src/org/chromium/chrome/browser/safety_check/SafetyCheckUpdatesDelegateImpl.java", "java/src/org/chromium/chrome/browser/safety_check/SafetyCheckUpdatesDelegateImpl.java",
"java/src/org/chromium/chrome/browser/screenshot/EditorScreenshotSource.java",
"java/src/org/chromium/chrome/browser/screenshot/EditorScreenshotTask.java",
"java/src/org/chromium/chrome/browser/search_engines/SearchEngineChoiceMetrics.java", "java/src/org/chromium/chrome/browser/search_engines/SearchEngineChoiceMetrics.java",
"java/src/org/chromium/chrome/browser/search_engines/SearchEngineChoiceNotification.java", "java/src/org/chromium/chrome/browser/search_engines/SearchEngineChoiceNotification.java",
"java/src/org/chromium/chrome/browser/search_engines/TemplateUrlServiceFactory.java", "java/src/org/chromium/chrome/browser/search_engines/TemplateUrlServiceFactory.java",
......
...@@ -323,9 +323,6 @@ specific_include_rules = { ...@@ -323,9 +323,6 @@ specific_include_rules = {
"SafeBrowsingPasswordReuseDialogBridge\.java": [ "SafeBrowsingPasswordReuseDialogBridge\.java": [
"+chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java", "+chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java",
], ],
"EditorScreenshotTask\.java": [
"+chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java",
],
"SendTabToSelfInfoBarController\.java": [ "SendTabToSelfInfoBarController\.java": [
"+chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java", "+chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java",
], ],
......
file://components/send_tab_to_self/OWNERS
# COMPONENT: UI>Browser>Sharing
# OS: Android
...@@ -2749,7 +2749,6 @@ static_library("browser") { ...@@ -2749,7 +2749,6 @@ static_library("browser") {
"android/rlz/revenue_stats.cc", "android/rlz/revenue_stats.cc",
"android/rlz/rlz_ping_handler.cc", "android/rlz/rlz_ping_handler.cc",
"android/rlz/rlz_ping_handler.h", "android/rlz/rlz_ping_handler.h",
"android/screenshot/editor_screenshot_task.cc",
"android/search_permissions/search_geolocation_disclosure_infobar_delegate.cc", "android/search_permissions/search_geolocation_disclosure_infobar_delegate.cc",
"android/search_permissions/search_geolocation_disclosure_infobar_delegate.h", "android/search_permissions/search_geolocation_disclosure_infobar_delegate.h",
"android/search_permissions/search_geolocation_disclosure_tab_helper.cc", "android/search_permissions/search_geolocation_disclosure_tab_helper.cc",
......
...@@ -9,6 +9,7 @@ import("//chrome/browser/buildflags.gni") ...@@ -9,6 +9,7 @@ import("//chrome/browser/buildflags.gni")
source_set("share") { source_set("share") {
sources = [ sources = [
"bitmap_download_request.cc", "bitmap_download_request.cc",
"editor_screenshot_task.cc",
"features.cc", "features.cc",
"features.h", "features.h",
"link_to_text_metrics_bridge.cc", "link_to_text_metrics_bridge.cc",
...@@ -23,7 +24,9 @@ source_set("share") { ...@@ -23,7 +24,9 @@ source_set("share") {
"//components/shared_highlighting/core/common", "//components/shared_highlighting/core/common",
"//content/public/browser", "//content/public/browser",
"//skia", "//skia",
"//ui/android",
"//ui/gfx", "//ui/gfx",
"//ui/snapshot",
] ]
} }
......
...@@ -11,8 +11,6 @@ include_rules = [ ...@@ -11,8 +11,6 @@ include_rules = [
"+chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java", "+chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java",
"+chrome/android/java/src/org/chromium/chrome/browser/modules/ModuleInstallUi.java", "+chrome/android/java/src/org/chromium/chrome/browser/modules/ModuleInstallUi.java",
"+chrome/android/java/src/org/chromium/chrome/browser/notifications", "+chrome/android/java/src/org/chromium/chrome/browser/notifications",
"+chrome/android/java/src/org/chromium/chrome/browser/screenshot/EditorScreenshotSource.java",
"+chrome/android/java/src/org/chromium/chrome/browser/screenshot/EditorScreenshotTask.java",
"+chrome/android/java/src/org/chromium/chrome/browser/share", "+chrome/android/java/src/org/chromium/chrome/browser/share",
"+chrome/services/qrcode_generator", "+chrome/services/qrcode_generator",
"+components/browser_ui/notifications/android", "+components/browser_ui/notifications/android",
...@@ -22,5 +20,6 @@ include_rules = [ ...@@ -22,5 +20,6 @@ include_rules = [
"+components/infobars/android", "+components/infobars/android",
"+components/shared_highlighting/core/common", "+components/shared_highlighting/core/common",
"+content/public/android/java/src/org/chromium/content_public/browser/RenderWidgetHostView.java", "+content/public/android/java/src/org/chromium/content_public/browser/RenderWidgetHostView.java",
"+content/public/android/java/src/org/chromium/content_public/browser/UiThreadTaskTraits.java",
"+content/public/android/java/src/org/chromium/content_public/browser/WebContents.java", "+content/public/android/java/src/org/chromium/content_public/browser/WebContents.java",
] ]
...@@ -38,6 +38,7 @@ generate_jni("jni_headers") { ...@@ -38,6 +38,7 @@ generate_jni("jni_headers") {
"java/src/org/chromium/chrome/browser/share/BitmapDownloadRequest.java", "java/src/org/chromium/chrome/browser/share/BitmapDownloadRequest.java",
"java/src/org/chromium/chrome/browser/share/link_to_text/LinkToTextMetricsBridge.java", "java/src/org/chromium/chrome/browser/share/link_to_text/LinkToTextMetricsBridge.java",
"java/src/org/chromium/chrome/browser/share/qrcode/QRCodeGenerationRequest.java", "java/src/org/chromium/chrome/browser/share/qrcode/QRCodeGenerationRequest.java",
"java/src/org/chromium/chrome/browser/share/screenshot/EditorScreenshotTask.java",
"java/src/org/chromium/chrome/browser/share/send_tab_to_self/NotificationManager.java", "java/src/org/chromium/chrome/browser/share/send_tab_to_self/NotificationManager.java",
"java/src/org/chromium/chrome/browser/share/send_tab_to_self/SendTabToSelfAndroidBridge.java", "java/src/org/chromium/chrome/browser/share/send_tab_to_self/SendTabToSelfAndroidBridge.java",
"java/src/org/chromium/chrome/browser/share/send_tab_to_self/SendTabToSelfEntry.java", "java/src/org/chromium/chrome/browser/share/send_tab_to_self/SendTabToSelfEntry.java",
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
package org.chromium.chrome.browser.screenshot; package org.chromium.chrome.browser.share.screenshot;
import android.graphics.Bitmap; import android.graphics.Bitmap;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
package org.chromium.chrome.browser.screenshot; package org.chromium.chrome.browser.share.screenshot;
import android.app.Activity; import android.app.Activity;
import android.graphics.Bitmap; import android.graphics.Bitmap;
...@@ -16,7 +16,6 @@ import org.chromium.base.annotations.JNINamespace; ...@@ -16,7 +16,6 @@ import org.chromium.base.annotations.JNINamespace;
import org.chromium.base.annotations.NativeMethods; import org.chromium.base.annotations.NativeMethods;
import org.chromium.base.task.PostTask; import org.chromium.base.task.PostTask;
import org.chromium.chrome.browser.app.ChromeActivity; import org.chromium.chrome.browser.app.ChromeActivity;
import org.chromium.chrome.browser.tab.SadTab;
import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.tab.Tab;
import org.chromium.components.browser_ui.bottomsheet.BottomSheetController; import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
import org.chromium.content_public.browser.UiThreadTaskTraits; import org.chromium.content_public.browser.UiThreadTaskTraits;
...@@ -138,7 +137,7 @@ public final class EditorScreenshotTask implements EditorScreenshotSource { ...@@ -138,7 +137,7 @@ public final class EditorScreenshotTask implements EditorScreenshotSource {
if (!currentTab.isUserInteractable()) return true; if (!currentTab.isUserInteractable()) return true;
// If the tab focused and not showing Android widget based content, then use the Compositor // If the tab focused and not showing Android widget based content, then use the Compositor
// based screenshot. // based screenshot.
if (currentTab.getNativePage() == null && !SadTab.isShowing(currentTab)) return true; if (currentTab.getNativePage() == null && !currentTab.isShowingCustomView()) return true;
// Assume the UI is drawn primarily by Android widgets, so do not use the Compositor // Assume the UI is drawn primarily by Android widgets, so do not use the Compositor
// screenshot. // screenshot.
......
...@@ -12,8 +12,6 @@ import androidx.annotation.VisibleForTesting; ...@@ -12,8 +12,6 @@ import androidx.annotation.VisibleForTesting;
import org.chromium.chrome.R; import org.chromium.chrome.R;
import org.chromium.chrome.browser.image_editor.ImageEditorDialogCoordinator; import org.chromium.chrome.browser.image_editor.ImageEditorDialogCoordinator;
import org.chromium.chrome.browser.modules.ModuleInstallUi; import org.chromium.chrome.browser.modules.ModuleInstallUi;
import org.chromium.chrome.browser.screenshot.EditorScreenshotSource;
import org.chromium.chrome.browser.screenshot.EditorScreenshotTask;
import org.chromium.chrome.browser.share.share_sheet.ChromeOptionShareCallback; import org.chromium.chrome.browser.share.share_sheet.ChromeOptionShareCallback;
import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.tab.Tab;
import org.chromium.chrome.modules.image_editor.ImageEditorModuleProvider; import org.chromium.chrome.modules.image_editor.ImageEditorModuleProvider;
......
...@@ -27,6 +27,8 @@ share_java_sources = [ ...@@ -27,6 +27,8 @@ share_java_sources = [
"//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/share_tab/QrCodeShareView.java", "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/share_tab/QrCodeShareView.java",
"//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/share_tab/QrCodeShareViewBinder.java", "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/share_tab/QrCodeShareViewBinder.java",
"//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/share_tab/QrCodeShareViewProperties.java", "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/share_tab/QrCodeShareViewProperties.java",
"//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/screenshot/EditorScreenshotSource.java",
"//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/screenshot/EditorScreenshotTask.java",
"//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/screenshot/ScreenshotCoordinator.java", "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/screenshot/ScreenshotCoordinator.java",
"//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/screenshot/ScreenshotShareSheetCoordinator.java", "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/screenshot/ScreenshotShareSheetCoordinator.java",
"//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/screenshot/ScreenshotShareSheetDialog.java", "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/screenshot/ScreenshotShareSheetDialog.java",
......
...@@ -28,7 +28,6 @@ import org.mockito.MockitoAnnotations; ...@@ -28,7 +28,6 @@ import org.mockito.MockitoAnnotations;
import org.chromium.base.test.BaseRobolectricTestRunner; import org.chromium.base.test.BaseRobolectricTestRunner;
import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.flags.ChromeFeatureList;
import org.chromium.chrome.browser.image_editor.ImageEditorDialogCoordinator; import org.chromium.chrome.browser.image_editor.ImageEditorDialogCoordinator;
import org.chromium.chrome.browser.screenshot.EditorScreenshotSource;
import org.chromium.chrome.browser.share.share_sheet.ChromeOptionShareCallback; import org.chromium.chrome.browser.share.share_sheet.ChromeOptionShareCallback;
import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.tab.Tab;
import org.chromium.chrome.modules.image_editor.ImageEditorModuleProvider; import org.chromium.chrome.modules.image_editor.ImageEditorModuleProvider;
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include "base/android/scoped_java_ref.h" #include "base/android/scoped_java_ref.h"
#include "base/bind.h" #include "base/bind.h"
#include "base/memory/ref_counted_memory.h" #include "base/memory/ref_counted_memory.h"
#include "chrome/android/chrome_jni_headers/EditorScreenshotTask_jni.h" #include "chrome/browser/share/android/jni_headers/EditorScreenshotTask_jni.h"
#include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkBitmap.h"
#include "ui/android/window_android.h" #include "ui/android/window_android.h"
#include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/rect.h"
......
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