Commit f0a2c44b authored by kkimlabs's avatar kkimlabs Committed by Commit bot

[Android] Upstreamed Stars UMA from iOS.

There are some UMA strings, enum constants in iOS repository
that can be shared with Android, so moved to components.

BUG=452254

Review URL: https://codereview.chromium.org/891493003

Cr-Commit-Position: refs/heads/master@{#314707}
parent 97823ee2
...@@ -108,6 +108,7 @@ android_library("chrome_java") { ...@@ -108,6 +108,7 @@ android_library("chrome_java") {
"//chrome:page_info_connection_type_javagen", "//chrome:page_info_connection_type_javagen",
"//chrome:content_setting_javagen", "//chrome:content_setting_javagen",
"//chrome:content_settings_type_javagen", "//chrome:content_settings_type_javagen",
"//components/enhanced_bookmarks:enhanced_bookmarks_launch_location_srcjar",
] ]
DEPRECATED_java_in_dir = "java/src" DEPRECATED_java_in_dir = "java/src"
......
...@@ -616,6 +616,7 @@ ...@@ -616,6 +616,7 @@
'../base/base.gyp:base', '../base/base.gyp:base',
'../components/components.gyp:bookmarks_java', '../components/components.gyp:bookmarks_java',
'../components/components.gyp:dom_distiller_core_java', '../components/components.gyp:dom_distiller_core_java',
'../components/components.gyp:enhanced_bookmarks_launch_location_srcjar',
'../components/components.gyp:gcm_driver_java', '../components/components.gyp:gcm_driver_java',
'../components/components.gyp:invalidation_java', '../components/components.gyp:invalidation_java',
'../components/components.gyp:navigation_interception_java', '../components/components.gyp:navigation_interception_java',
......
...@@ -92,4 +92,20 @@ ...@@ -92,4 +92,20 @@
'includes': [ '../build/protoc.gypi' ], 'includes': [ '../build/protoc.gypi' ],
}, },
], ],
'conditions' : [
['OS=="android"', {
'targets': [
{
# GN: //components/enhanced_bookmarks:enhanced_bookmarks_launch_location_srcjar
'target_name': 'enhanced_bookmarks_launch_location_srcjar',
'type': 'none',
'variables': {
'source_file': 'enhanced_bookmarks/enhanced_bookmark_utils.h',
},
'includes': [ '../build/android/java_cpp_enum.gypi' ],
},
],
},
],
],
} }
...@@ -2,6 +2,11 @@ ...@@ -2,6 +2,11 @@
# 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.
if (is_android) {
import("//build/config/android/config.gni")
import("//build/config/android/rules.gni")
}
# GYP: //components/enhanced_bookmarks.gypi:enhanced_bookmarks # GYP: //components/enhanced_bookmarks.gypi:enhanced_bookmarks
source_set("enhanced_bookmarks") { source_set("enhanced_bookmarks") {
sources = [ sources = [
...@@ -49,6 +54,18 @@ source_set("enhanced_bookmarks") { ...@@ -49,6 +54,18 @@ source_set("enhanced_bookmarks") {
} }
} }
if (is_android) {
# GYP: //components/enhanced_bookmarks.gypi:enhanced_bookmarks_launch_location_srcjar
java_cpp_enum("enhanced_bookmarks_launch_location_srcjar") {
sources = [
"enhanced_bookmark_utils.h",
]
outputs = [
"org/chromium/chrome/browser/enhancedbookmark/LaunchLocation.java",
]
}
}
# GYP: //components/enhanced_bookmarks.gypi:enhanced_bookmarks_test_support # GYP: //components/enhanced_bookmarks.gypi:enhanced_bookmarks_test_support
source_set("test_support") { source_set("test_support") {
testonly = true testonly = true
......
...@@ -16,6 +16,23 @@ class BookmarkNode; ...@@ -16,6 +16,23 @@ class BookmarkNode;
namespace enhanced_bookmarks { namespace enhanced_bookmarks {
static const char kLaunchLocationUMA[] = "Stars.LaunchLocation";
// Possible locations where a bookmark can be opened from.
// Please sync with the corresponding histograms.xml.
//
// A Java counterpart will be generated for this enum.
// GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser.enhancedbookmark
enum LaunchLocation {
ALL_ITEMS = 0,
UNCATEGORIZED = 1, // Deprecated.
FOLDER = 2,
FILTER = 3,
SEARCH = 4,
BOOKMARK_EDITOR = 5,
COUNT = 6,
};
// The vector is sorted in place. // The vector is sorted in place.
// All of the bookmarks in |nodes| must be urls. // All of the bookmarks in |nodes| must be urls.
void SortBookmarksByName(std::vector<const bookmarks::BookmarkNode*>& nodes); void SortBookmarksByName(std::vector<const bookmarks::BookmarkNode*>& nodes);
......
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