commit d830894230c7cde07ff92234c6a4e4424b39e10e
author peconn <peconn@chromium.org> Thu Apr 28 12:38:42 2016
committer Commit bot <commit-bot@chromium.org> Thu Apr 28 12:39:46 2016
tree 5d3dc010aff90246643c944b6f5cad74ed24794c
parent 331e4aa7f90abc5a73052d21627e891959851c73

Unified Bookmarks and Recent Tabs signin methods.

This involves moving the Recent Tabs signin method to showing a button that
summons a Signin Activity (previously the Signin Activity was integrated in
the Recent Tabs page) - this is the SigninAndSyncView.

This also provides a Settings link to the Bookmarks and Recent Tabs signin
flows.

Additionally, it replaces the BookmarkSigninActivity with the AccountSigninActivity.

BUG=583774, 598868, 599736

Review-Url: https://codereview.chromium.org/1901623002
Cr-Commit-Position: refs/heads/master@{#390356}

chrome/android/java_sources.gni

diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
index 5b6184ac..e88a85c1 100644
--- a/chrome/android/java_sources.gni
+++ b/chrome/android/java_sources.gni
@@ -110,7 +110,6 @@
   "java/src/org/chromium/chrome/browser/bookmarks/BookmarkRow.java",
   "java/src/org/chromium/chrome/browser/bookmarks/BookmarkSearchRow.java",
   "java/src/org/chromium/chrome/browser/bookmarks/BookmarkSearchView.java",
-  "java/src/org/chromium/chrome/browser/bookmarks/BookmarkSigninActivity.java",
   "java/src/org/chromium/chrome/browser/bookmarks/BookmarkUIObserver.java",
   "java/src/org/chromium/chrome/browser/bookmarks/BookmarkUIState.java",
   "java/src/org/chromium/chrome/browser/bookmarks/BookmarkUndoController.java",
@@ -500,7 +499,6 @@
   "java/src/org/chromium/chrome/browser/ntp/RecentTabsGroupView.java",
   "java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java",
   "java/src/org/chromium/chrome/browser/ntp/RecentTabsPage.java",
-  "java/src/org/chromium/chrome/browser/ntp/RecentTabsPromoView.java",
   "java/src/org/chromium/chrome/browser/ntp/RecentTabsRowAdapter.java",
   "java/src/org/chromium/chrome/browser/ntp/RecentlyClosedBridge.java",
   "java/src/org/chromium/chrome/browser/ntp/interests/InterestsItemView.java",
@@ -738,6 +736,7 @@
   "java/src/org/chromium/chrome/browser/signin/GoogleActivityController.java",
   "java/src/org/chromium/chrome/browser/signin/OAuth2TokenService.java",
   "java/src/org/chromium/chrome/browser/signin/SignOutDialogFragment.java",
+  "java/src/org/chromium/chrome/browser/signin/SigninAndSyncView.java",
   "java/src/org/chromium/chrome/browser/signin/SigninHelper.java",
   "java/src/org/chromium/chrome/browser/signin/SigninInvestigator.java",
   "java/src/org/chromium/chrome/browser/signin/SigninManager.java",