Commit 627679c0 authored by Jeffrey Cohen's avatar Jeffrey Cohen Committed by Commit Bot

Reland "[Screenshot] Enable image editor for canary builds."

This is a reland of af2e1e93

Original change's description:
> [Screenshot] Enable image editor for canary builds.
> 
> Bug: 1024586
> Change-Id: I586d8dc0a05c0aab3776b42c9145d0f6a586c1f7
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2032505
> Commit-Queue: Jeffrey Cohen <jeffreycohen@chromium.org>
> Reviewed-by: Kristi Park <kristipark@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#793791}

Bug: 1024586
Change-Id: Iaa640531a8190fc0c1bebcc05990330283327e04
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2342125Reviewed-by: default avatarKristi Park <kristipark@chromium.org>
Commit-Queue: Jeffrey Cohen <jeffreycohen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#796085}
parent e1723804
...@@ -2,6 +2,7 @@ ...@@ -2,6 +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.
import("//build/config/android/channel.gni")
import("//build/config/android/rules.gni") import("//build/config/android/rules.gni")
_ink_dir = _ink_dir =
...@@ -10,7 +11,8 @@ _ink_dir = ...@@ -10,7 +11,8 @@ _ink_dir =
declare_args() { declare_args() {
# Whether to enable the ImageEditor in Chrome. # Whether to enable the ImageEditor in Chrome.
enable_image_editor = false enable_image_editor =
android_channel == "default" || android_channel == "canary"
} }
image_editor_module_desc = { image_editor_module_desc = {
......
...@@ -9,5 +9,9 @@ import("//build/config/android/rules.gni") ...@@ -9,5 +9,9 @@ import("//build/config/android/rules.gni")
android_library("java") { android_library("java") {
sources = [ "android/java/src/org/chromium/chrome/browser/image_editor/ImageEditorDialogCoordinatorImpl.java" ] sources = [ "android/java/src/org/chromium/chrome/browser/image_editor/ImageEditorDialogCoordinatorImpl.java" ]
deps = [ "//chrome/browser/image_editor/public:java" ] deps = [
"//chrome/browser/image_editor/public:java",
"//chrome/browser/share:java",
"//chrome/browser/tab:java",
]
} }
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