Merge ToolbarHelper to ToolbarManager

Merge ToolbarHelper to ToolbarManager

Currently the helper owns the manager and handles plumbing a few calls from
the activity to it. This change merges the two and makes the manager the only
controller class related with the Toolbar. After this change any activity
level cleanup can be focused on the ToolbarManager.

BUG=501509
Committed: https://crrev.com/76e9bd0ade1196b2baa560f00331a0e43df00c7e
Cr-Commit-Position: refs/heads/master@{#335565}

[Yusuf, 2015-06-16 22:38:13]

yusufo@chromium.org changed reviewers:
+ tedchoc@chromium.org

[Ted C, 2015-06-19 23:09:32]

lgtm

https://codereview.chromium.org/1187623004/diff/1/chrome/android/java_staging...
File
chrome/android/java_staging/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
(right):

https://codereview.chromium.org/1187623004/diff/1/chrome/android/java_staging...
chrome/android/java_staging/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java:564:
mInitialized = true;
Might want to say initializedWithNative or something.  Also, add an assert to
the top of this function to ensure it's false

https://codereview.chromium.org/1187623004/diff/1/chrome/android/java_staging...
chrome/android/java_staging/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java:609:
if (activityTab != null) activityTab.removeObserver(mTabObserver);
I think you want to remove the observer of getToolbarModel().getTab() instead of
the activity tab as far as I can tell.

[Yusuf, 2015-06-22 20:55:51]

The CQ bit was checked by yusufo@chromium.org

[Yusuf, 2015-06-22 20:55:52]

The patchset sent to the CQ was uploaded after l-g-t-m from tedchoc@chromium.org
Link to the patchset: https://codereview.chromium.org/1187623004/#ps20001
(title: "Nits and fixed an NPE")

[Yusuf, 2015-06-22 20:56:16]

https://codereview.chromium.org/1187623004/diff/1/chrome/android/java_staging...
File
chrome/android/java_staging/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
(right):

https://codereview.chromium.org/1187623004/diff/1/chrome/android/java_staging...
chrome/android/java_staging/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java:564:
mInitialized = true;
On 2015/06/19 23:09:32, Ted C wrote:
> Might want to say initializedWithNative or something.  Also, add an assert to
> the top of this function to ensure it's false

Done.

https://codereview.chromium.org/1187623004/diff/1/chrome/android/java_staging...
chrome/android/java_staging/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java:609:
if (activityTab != null) activityTab.removeObserver(mTabObserver);
On 2015/06/19 23:09:32, Ted C wrote:
> I think you want to remove the observer of getToolbarModel().getTab() instead
of
> the activity tab as far as I can tell.

Done.

[commit-bot: I haz the power, 2015-06-22 20:57:27]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1187623004/20001

[commit-bot: I haz the power, 2015-06-22 21:41:55]

Committed patchset #2 (id:20001)

[commit-bot: I haz the power, 2015-06-22 21:42:41]

Patchset 2 (id:??) landed as
https://crrev.com/76e9bd0ade1196b2baa560f00331a0e43df00c7e
Cr-Commit-Position: refs/heads/master@{#335565}