diff options
| author | ianwen <ianwen@chromium.org> | 2015-02-12 15:36:28 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-12 23:37:16 +0000 |
| commit | ec62d8d37848b12309994f10bf8457ae4fcabb8e (patch) | |
| tree | e848ac5fd7cb481149047e2d56953bd056c26ae4 /components/enhanced_bookmarks | |
| parent | a249805f376e40174998be288ed64c6463d69000 (diff) | |
| download | chromium_src-ec62d8d37848b12309994f10bf8457ae4fcabb8e.zip chromium_src-ec62d8d37848b12309994f10bf8457ae4fcabb8e.tar.gz chromium_src-ec62d8d37848b12309994f10bf8457ae4fcabb8e.tar.bz2 | |
Upstream Enhanced Bookmark Model (2nd Land)
This is the data layer of enhanced bookmark. There is no reason why
this class should live in private repository.
BUG=428832
Previously landed in:
https://crrev.com/691b64f43fc0a69752344e5edbbc4d8f406cf261
Reverted in: https://crrev.com/f40cb64710a333da6d554e98dfcc432cd6cf8f1f
Review URL: https://codereview.chromium.org/923653002
Cr-Commit-Position: refs/heads/master@{#316085}
Diffstat (limited to 'components/enhanced_bookmarks')
| -rw-r--r-- | components/enhanced_bookmarks/BUILD.gn | 2 | ||||
| -rw-r--r-- | components/enhanced_bookmarks/enhanced_bookmark_utils.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/components/enhanced_bookmarks/BUILD.gn b/components/enhanced_bookmarks/BUILD.gn index 11462c4..924b570 100644 --- a/components/enhanced_bookmarks/BUILD.gn +++ b/components/enhanced_bookmarks/BUILD.gn @@ -61,7 +61,7 @@ if (is_android) { "enhanced_bookmark_utils.h", ] outputs = [ - "org/chromium/chrome/browser/enhancedbookmark/LaunchLocation.java", + "org/chromium/chrome/browser/enhanced_bookmarks/LaunchLocation.java", ] } } diff --git a/components/enhanced_bookmarks/enhanced_bookmark_utils.h b/components/enhanced_bookmarks/enhanced_bookmark_utils.h index f2ce4dc..97a9b27 100644 --- a/components/enhanced_bookmarks/enhanced_bookmark_utils.h +++ b/components/enhanced_bookmarks/enhanced_bookmark_utils.h @@ -22,7 +22,7 @@ static const char kLaunchLocationUMA[] = "Stars.LaunchLocation"; // 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 +// GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser.enhanced_bookmarks enum LaunchLocation { ALL_ITEMS = 0, UNCATEGORIZED = 1, // Deprecated. |