Update strings for history description in CBD

chrome/android/java/src/org/chromium/chrome/browser/history/HistoryAdapter.java

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.history;
 
 import android.content.res.Resources;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.RecyclerView.ViewHolder;
 import android.text.SpannableString;
 import android.text.method.LinkMovementMethod;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.FrameLayout;
 import android.widget.TextView;
 
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.chrome.browser.history.HistoryProvider.BrowsingHistoryObserver;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.widget.DateDividedAdapter;
 import org.chromium.chrome.browser.widget.displaystyle.MarginResizer;
 import org.chromium.chrome.browser.widget.selection.SelectableItemViewHolder;
 import org.chromium.chrome.browser.widget.selection.SelectableListLayout;
 import org.chromium.chrome.browser.widget.selection.SelectionDelegate;
 import org.chromium.chrome.browser.widget.selection.SelectionDelegate.SelectionObserver;
 import org.chromium.components.signin.ChromeSigninController;
 import org.chromium.ui.text.NoUnderlineClickableSpan;
 import org.chromium.ui.text.SpanApplier;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
 /**
  * Bridges the user's browsing history and the UI used to display it.
  */
 public class HistoryAdapter extends DateDividedAdapter implements BrowsingHistoryObserver {
     private static final String EMPTY_QUERY = "";
     private static final String LEARN_MORE_LINK =
             "https://support.google.com/chrome/?p=sync_history&hl="
                     + Locale.getDefault().toString();
     private static final String GOOGLE_HISTORY_LINK = "history.google.com";
+    private static final String MY_ACTIVITY_LINK = "myactivity.google.com";
 
     private final SelectionDelegate<HistoryItem> mSelectionDelegate;
     private final HistoryProvider mHistoryProvider;
     private final HistoryManager mHistoryManager;
     private final ArrayList<HistoryItemView> mItemViews;
     private RecyclerView mRecyclerView;
 
     private ViewGroup mPrivacyDisclaimers;
     private TextView mSignedInNotSyncedTextView;
     private TextView mSignedInSyncedTextView;
@@ skipping 270 matching lines @@
         mSignedInSyncedTextView = (TextView) v.findViewById(R.id.signed_in_synced);
         setPrivacyDisclaimerText(mSignedInSyncedTextView,
                 R.string.android_history_has_synced_results, LEARN_MORE_LINK);
         MarginResizer.createWithViewAdapter(mSignedInSyncedTextView,
                 mHistoryManager.getSelectableListLayout().getUiConfig(),
                 getDefaultTextMargin(resources),
                 SelectableListLayout.getDefaultListItemLateralShadowSizePx(resources));
 
         mOtherFormsOfBrowsingHistoryTextView = (TextView) v.findViewById(
                 R.id.other_forms_of_browsing_history);
-        setPrivacyDisclaimerText(mOtherFormsOfBrowsingHistoryTextView,
-                R.string.android_history_other_forms_of_history, GOOGLE_HISTORY_LINK);
+        boolean flagEnabled = ChromeFeatureList.isEnabled(ChromeFeatureList.TABS_IN_CBD);

[Yaron, 2017/05/24 14:18:43]

is native guaranteed to be loaded at this point? I think probably yes but want
to make sure you've considered it

[dullweber, 2017/05/24 14:54:52]

Thanks for pointing at this, I don't know how the initialization of the native
library exactly works but I think it should be initialized:

HistoryAdapter is created in the constructor of HistoryManager. The
HistoryManager constructor calls historyAdapter.initialize(), which makes a call
to BrowsingHistoryBridge::queryHistory, which calls nativeQueryHistory().
That should mean that native calls are possible when HistoryAdapter is created,
right? 

Other than that, the HistoryActivity, which creates the HistoryManager should
only be created when a user selects history from the menu, so that is definitely
late enough?

[Yaron, 2017/05/24 15:27:06]

yep.
not always true. if the activity is in recents and chrome gets killed while in
the background this could be an issue when user comes back to chrome. But
looking at HistortyActivity, if you follow the hierarchy, it looks to do
synchronous init in onCreate so this is ok. 

+        int disclaimerTextId = flagEnabled ? R.string.android_history_other_forms_of_history_new
+                                           : R.string.android_history_other_forms_of_history;
+        String disclaimerUrl = flagEnabled ? MY_ACTIVITY_LINK : GOOGLE_HISTORY_LINK;
+        setPrivacyDisclaimerText(
+                mOtherFormsOfBrowsingHistoryTextView, disclaimerTextId, disclaimerUrl);
         MarginResizer.createWithViewAdapter(mOtherFormsOfBrowsingHistoryTextView,
                 mHistoryManager.getSelectableListLayout().getUiConfig(),
                 getDefaultTextMargin(resources),
                 SelectableListLayout.getDefaultListItemLateralShadowSizePx(resources));
 
         setPrivacyDisclaimerVisibility();
 
         return new BasicViewHolder(v);
     }
 
@@ skipping 67 matching lines @@
     @VisibleForTesting
     TextView getSignedInSyncedViewForTests() {
         return mSignedInSyncedTextView;
     }
 
     @VisibleForTesting
     TextView getOtherFormsOfBrowsingHistoryViewForTests() {
         return mOtherFormsOfBrowsingHistoryTextView;
     }
 }