Rename EnhancedBookmarks to Bookmarks, part 1.

Rename EnhancedBookmarks to Bookmarks, part 1.

There is only one bookmarks UI now, so we can simplify the naming. This
renames the Java package "enhancedbookmarks" to "bookmarks" and removes
Enhanced from all the Java class names. A later CL will rename
resources, comments, and other remaining bits.

Generated with these commands in the src/chrome/android folder.

  for f in $(find . -name enhancedbookmarks); do git mv $f ${f/enhancedb/b}; done
  for f in $(find . -name EnhancedBookmark*); do b=$(basename $f); b=${b/.java/}; git-replace $b ${b/EnhancedB/B}; git mv $f ${f/EnhancedB/B}; done
  git-replace enhancedbookmarks bookmarks
  git-replace EnhancedBookmarkDeleteObserver BookmarkDeleteObserver
  git-replace EnhancedBookmarkStateChangeListener BookmarkStateChangeListener

and using Eclipse to reorder imports.

BUG=474719
Committed: https://crrev.com/7db921c5495404726f5c654e879bf97ad9eede69
Cr-Commit-Position: refs/heads/master@{#375215}

[newt (away), 2016-02-10 22:36:56]

newt@chromium.org changed reviewers:
+ ianwen@chromium.org

[newt (away), 2016-02-10 22:36:57]

PTAL

https://codereview.chromium.org/1688033002/diff/1/chrome/android/java/src/org...
File
chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarksModel.java
(left):

https://codereview.chromium.org/1688033002/diff/1/chrome/android/java/src/org...
chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarksModel.java:1:
// Copyright 2015 The Chromium Authors. All rights reserved.
Should we get rid of the "s" in BookmarksModel? I'm learning towards Yes.

[Ian Wen, 2016-02-10 22:59:04]

Wow thank you so much for this awesome CL!!!

https://codereview.chromium.org/1688033002/diff/1/chrome/android/java/src/org...
File
chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
(right):

https://codereview.chromium.org/1688033002/diff/1/chrome/android/java/src/org...
chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java:940:
ChromeTabbedActivity.this);
ChromeTabbedActivity can be pushed to the previous line.

https://codereview.chromium.org/1688033002/diff/1/chrome/android/java/src/org...
File
chrome/android/java/src/org/chromium/chrome/browser/bookmark/BookmarksBridge.java
(left):

https://codereview.chromium.org/1688033002/diff/1/chrome/android/java/src/org...
chrome/android/java/src/org/chromium/chrome/browser/bookmark/BookmarksBridge.java:5:
package org.chromium.chrome.browser.bookmark;
After this CL we will have a "bookmark" package and a "bookmarks" package. Is
this intented? Personally I would prefer using "bookmark" as package name and
"BookmarkBridge" "BookmarkModel" "BookmarkActivity" as class name.

https://codereview.chromium.org/1688033002/diff/1/chrome/android/java/src/org...
File
chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java
(right):

https://codereview.chromium.org/1688033002/diff/1/chrome/android/java/src/org...
chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java:111:
item.getId());
Push #111 to #110?

https://codereview.chromium.org/1688033002/diff/1/chrome/android/java/src/org...
File
chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActivity.java
(right):

https://codereview.chromium.org/1688033002/diff/1/chrome/android/java/src/org...
chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActivity.java:21:
* {@link BookmarkManager} inside of it and creates a snackbar manager. This
activity
Maybe this javadoc needs reformatting.

https://codereview.chromium.org/1688033002/diff/1/chrome/android/java/src/org...
File
chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarksModel.java
(left):

https://codereview.chromium.org/1688033002/diff/1/chrome/android/java/src/org...
chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarksModel.java:1:
// Copyright 2015 The Chromium Authors. All rights reserved.
On 2016/02/10 22:36:57, newt (slow) wrote:
> Should we get rid of the "s" in BookmarksModel? I'm learning towards Yes.

I never use plural in class names, so a big yes!!

[newt (away), 2016-02-11 03:10:07]

Thanks for reviewing!

Just waiting on a decision about the package name (see comment inline).

https://codereview.chromium.org/1688033002/diff/1/chrome/android/java/src/org...
File
chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
(right):

https://codereview.chromium.org/1688033002/diff/1/chrome/android/java/src/org...
chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java:940:
ChromeTabbedActivity.this);
On 2016/02/10 22:59:03, Ian Wen wrote:
> ChromeTabbedActivity can be pushed to the previous line.

Done.

https://codereview.chromium.org/1688033002/diff/1/chrome/android/java/src/org...
File
chrome/android/java/src/org/chromium/chrome/browser/bookmark/BookmarksBridge.java
(left):

https://codereview.chromium.org/1688033002/diff/1/chrome/android/java/src/org...
chrome/android/java/src/org/chromium/chrome/browser/bookmark/BookmarksBridge.java:5:
package org.chromium.chrome.browser.bookmark;
On 2016/02/10 22:59:04, Ian Wen wrote:
> After this CL we will have a "bookmark" package and a "bookmarks" package. Is
> this intented? Personally I would prefer using "bookmark" as package name and
> "BookmarkBridge" "BookmarkModel" "BookmarkActivity" as class name.

I was using "bookmarks" because it parallels the folder names that are used for
c++ bookmark code. Those folders are all called "bookmarks":
components/bookmarks, chrome/browser/bookmarks, chrome/browser/ui/bookmarks,
chrome/browser/android/bookmarks, etc. There aren't any folders called
"bookmark".

If we go that route, then I'll move BookmarkBridge into the "bookmarks" package.
The other three files in this folder are related to ChromeBrowserProvider and
are totally separate from all the bookmarks code that I'm touching here. They
could be moved into the "bookmarks" package or somewhere else, maybe
"browserprovider" along with ChromeBrowserProvider. That'd make some sense.

Thoughts?

https://codereview.chromium.org/1688033002/diff/1/chrome/android/java/src/org...
File
chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java
(right):

https://codereview.chromium.org/1688033002/diff/1/chrome/android/java/src/org...
chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java:111:
item.getId());
On 2016/02/10 22:59:04, Ian Wen wrote:
> Push #111 to #110?

Done.

https://codereview.chromium.org/1688033002/diff/1/chrome/android/java/src/org...
File
chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActivity.java
(right):

https://codereview.chromium.org/1688033002/diff/1/chrome/android/java/src/org...
chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActivity.java:21:
* {@link BookmarkManager} inside of it and creates a snackbar manager. This
activity
On 2016/02/10 22:59:04, Ian Wen wrote:
> Maybe this javadoc needs reformatting.

Done.

https://codereview.chromium.org/1688033002/diff/1/chrome/android/java/src/org...
File
chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarksModel.java
(left):

https://codereview.chromium.org/1688033002/diff/1/chrome/android/java/src/org...
chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarksModel.java:1:
// Copyright 2015 The Chromium Authors. All rights reserved.
On 2016/02/10 22:59:04, Ian Wen wrote:
> On 2016/02/10 22:36:57, newt (slow) wrote:
> > Should we get rid of the "s" in BookmarksModel? I'm learning towards Yes.
> 
> I never use plural in class names, so a big yes!!

Done :)

[Ian Wen, 2016-02-11 18:35:45]

lgtm! Woohoo!

https://codereview.chromium.org/1688033002/diff/1/chrome/android/java/src/org...
File
chrome/android/java/src/org/chromium/chrome/browser/bookmark/BookmarksBridge.java
(left):

https://codereview.chromium.org/1688033002/diff/1/chrome/android/java/src/org...
chrome/android/java/src/org/chromium/chrome/browser/bookmark/BookmarksBridge.java:5:
package org.chromium.chrome.browser.bookmark;
On 2016/02/11 03:10:07, newt (slow) wrote:
> On 2016/02/10 22:59:04, Ian Wen wrote:
> > After this CL we will have a "bookmark" package and a "bookmarks" package.
Is
> > this intented? Personally I would prefer using "bookmark" as package name
and
> > "BookmarkBridge" "BookmarkModel" "BookmarkActivity" as class name.
> 
> I was using "bookmarks" because it parallels the folder names that are used
for
> c++ bookmark code. Those folders are all called "bookmarks":
> components/bookmarks, chrome/browser/bookmarks, chrome/browser/ui/bookmarks,
> chrome/browser/android/bookmarks, etc. There aren't any folders called
> "bookmark".
> 
> If we go that route, then I'll move BookmarkBridge into the "bookmarks"
package.
> The other three files in this folder are related to ChromeBrowserProvider and
> are totally separate from all the bookmarks code that I'm touching here. They
> could be moved into the "bookmarks" package or somewhere else, maybe
> "browserprovider" along with ChromeBrowserProvider. That'd make some sense.
> 
> Thoughts?

I see. Matching folder names in java and C++ is a good idea. Let's name package
to be "bookmarks" then.

Also moving bookmark related class to browserprovider folder sounds very
reasonable.

https://codereview.chromium.org/1688033002/diff/20001/chrome/android/java/src...
File
chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkRecyclerView.java
(right):

https://codereview.chromium.org/1688033002/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkRecyclerView.java:24:
BookmarkUIObserver {
This line can be moved to #23.

https://codereview.chromium.org/1688033002/diff/20001/chrome/android/java/src...
File
chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUIState.java
(right):

https://codereview.chromium.org/1688033002/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUIState.java:63:
BookmarkModel bookmarkModel) {
Push this line to #62 as well? Same for #72.

https://codereview.chromium.org/1688033002/diff/20001/chrome/android/java/src...
File
chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java
(right):

https://codereview.chromium.org/1688033002/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java:299:
Context context) {
#299 -> #298

[newt (away), 2016-02-12 15:45:09]

https://codereview.chromium.org/1688033002/diff/20001/chrome/android/java/src...
File
chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkRecyclerView.java
(right):

https://codereview.chromium.org/1688033002/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkRecyclerView.java:24:
BookmarkUIObserver {
On 2016/02/11 18:35:45, Ian Wen wrote:
> This line can be moved to #23.

Done.

https://codereview.chromium.org/1688033002/diff/20001/chrome/android/java/src...
File
chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUIState.java
(right):

https://codereview.chromium.org/1688033002/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUIState.java:63:
BookmarkModel bookmarkModel) {
On 2016/02/11 18:35:45, Ian Wen wrote:
> Push this line to #62 as well? Same for #72.

Done.

[newt (away), 2016-02-12 16:10:15]

The CQ bit was checked by newt@chromium.org

[newt (away), 2016-02-12 16:10:15]

The patchset sent to the CQ was uploaded after l-g-t-m from ianwen@chromium.org
Link to the patchset: https://codereview.chromium.org/1688033002/#ps40001
(title: "comments from #2")

[commit-bot: I haz the power, 2016-02-12 16:10:45]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1688033002/40001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1688033002/40001

[commit-bot: I haz the power, 2016-02-12 16:17:54]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-02-12 16:17:55]

Try jobs failed on following builders:
  linux_chromium_gn_chromeos_rel on tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[newt (away), 2016-02-12 17:59:05]

The CQ bit was checked by newt@chromium.org

[commit-bot: I haz the power, 2016-02-12 17:59:49]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1688033002/40001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1688033002/40001

[commit-bot: I haz the power, 2016-02-12 18:44:39]

Committed patchset #3 (id:40001)

[commit-bot: I haz the power, 2016-02-16 22:44:03]

Description was changed from

==========
Rename EnhancedBookmarks to Bookmarks, part 1.

There is only one bookmarks UI now, so we can simplify the naming. This
renames the Java package "enhancedbookmarks" to "bookmarks" and removes
Enhanced from all the Java class names. A later CL will rename
resources, comments, and other remaining bits.

Generated with these commands in the src/chrome/android folder.

  for f in $(find . -name enhancedbookmarks); do git mv $f ${f/enhancedb/b};
done
  for f in $(find . -name EnhancedBookmark*); do b=$(basename $f);
b=${b/.java/}; git-replace $b ${b/EnhancedB/B}; git mv $f ${f/EnhancedB/B}; done
  git-replace enhancedbookmarks bookmarks
  git-replace EnhancedBookmarkDeleteObserver BookmarkDeleteObserver
  git-replace EnhancedBookmarkStateChangeListener BookmarkStateChangeListener

and using Eclipse to reorder imports.

BUG=474719
==========

to

==========
Rename EnhancedBookmarks to Bookmarks, part 1.

There is only one bookmarks UI now, so we can simplify the naming. This
renames the Java package "enhancedbookmarks" to "bookmarks" and removes
Enhanced from all the Java class names. A later CL will rename
resources, comments, and other remaining bits.

Generated with these commands in the src/chrome/android folder.

  for f in $(find . -name enhancedbookmarks); do git mv $f ${f/enhancedb/b};
done
  for f in $(find . -name EnhancedBookmark*); do b=$(basename $f);
b=${b/.java/}; git-replace $b ${b/EnhancedB/B}; git mv $f ${f/EnhancedB/B}; done
  git-replace enhancedbookmarks bookmarks
  git-replace EnhancedBookmarkDeleteObserver BookmarkDeleteObserver
  git-replace EnhancedBookmarkStateChangeListener BookmarkStateChangeListener

and using Eclipse to reorder imports.

BUG=474719

Committed: https://crrev.com/7db921c5495404726f5c654e879bf97ad9eede69
Cr-Commit-Position: refs/heads/master@{#375215}
==========

[commit-bot: I haz the power, 2016-02-16 22:44:04]

Patchset 3 (id:??) landed as
https://crrev.com/7db921c5495404726f5c654e879bf97ad9eede69
Cr-Commit-Position: refs/heads/master@{#375215}