Split the footer in ClearBrowsingDataPreferences into two paragraphs

Split the footer in ClearBrowsingDataPreferences into two paragraphs

The footer in the CBD preferences currently contains three sentences.
We add a fourth sentence mentioning that the user's Google account may
contain other forms of browsing history.

We then split the footer into two paragraphs, each represented by a new
TextMessageWithLinkPreference class. One paragraph contains the two
sentences related to Google Account and is decorated with the Google "G"
icon. The other one contains general information and is decorated with
an (i) icon.

The "G" paragraph is only shown to signed-in users, and the sentence about
other forms of browsing history is only shown after a callback from web
history service shows that they exist (to be done in a followup CL).
The (i) paragraph is shown permanently.

We also remove the "Learn more" preference at the bottom of the layout,
and instead embed it as a clickable link at the end of the (i) paragraph.

Design doc:
https://docs.google.com/document/d/1ZMDSAd44KmzKhqXPjobZOf9rZezs6VqiBnqpDD0auCU/

Mocks:
https://docs.google.com/presentation/d/1rpR3xB3aYFzXD0U--piuMq3y4XAmoYdawA2HC1cuEjM/

BUG=595332
Committed: https://crrev.com/07479cd26360d225d4872147bb701b922656a5a8
Cr-Commit-Position: refs/heads/master@{#385154}

[msramek, 2016-03-31 17:59:52]

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

[msramek, 2016-03-31 17:59:53]

Hi Newt,

please have a look!

I have one open TODO in this CL which is to position the icon according to the
mocks. I'll fix that tomorrow, but the rest of the CL is ready for review.

Thanks,
Martin

[msramek, 2016-04-01 16:18:28]

I finished the layout of TextMessageWithLinkAndIconPreference. I tried setting
the paddings and alignments programatically, but in the end, it's easier and
cleaner to just do it in XML.

I pretty much need just the standard icon + text layout, for which using
Preference#setIcon would be enough. However:
1. The padding between the text and icon is too large.
2. The icon is vertically centered, however, according to the material design
specs, it should be aligned to the top of the associated text.

I understand that the convention is that "title" is something short written with
large font size, and "summary" is something long, possibly multi-line, with
small font size. The footers meet the definition of summary, so I'm still using
the summary element in my new layout. However, I included the title element as
well, even though I don't use it, as it's probably unusual for a preference not
to support title. And it's more reusable this way.

[newt (away), 2016-04-02 01:24:03]

Be sure to run tools/resources/optimize-png-files.sh over the image files, if
you haven't already.

googleg.png is also being added gogerald@ in
https://codereview.chromium.org/1840513002/ as
personalize_google_service_logo.png. Please coordinate to make sure we don't end
up with two copies of that image.

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/java/res...
File
chrome/android/java/res/layout/text_message_with_link_and_icon_preference.xml
(right):

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/java/res...
chrome/android/java/res/layout/text_message_with_link_and_icon_preference.xml:8:
<LinearLayout
Use a RelativeLayout here to reduce nesting (see
http://developer.android.com/training/improving-layouts/optimizing-layout.html)

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/java/res...
chrome/android/java/res/layout/text_message_with_link_and_icon_preference.xml:10:
xmlns:chrome="http://schemas.android.com/apk/res-auto"
chrome namespace isn't needed

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/java/res...
chrome/android/java/res/layout/text_message_with_link_and_icon_preference.xml:14:
android:gravity="top">
not needed / redundant, since the ImageView specifies layout_gravity="top"

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/java/res...
chrome/android/java/res/layout/text_message_with_link_and_icon_preference.xml:29:
<TextView android:id="@+android:id/title"
nit: put android:id on the next line

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/java/res...
chrome/android/java/res/layout/text_message_with_link_and_icon_preference.xml:34:
<TextView android:id="@+android:id/summary"
To support accessibility users, use TextViewWithClickableSpans here.

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/java/res...
chrome/android/java/res/layout/text_message_with_link_and_icon_preference.xml:37:
android:textAppearance="?android:attr/textAppearanceSmall"
Instead of specifying textAppearance and textColor, use
style="@style/PreferenceTitle" and style="@style/PreferenceSummary". Those
styles vary according to API level, so these views will look correct on pre-L
(pre-Material) devices too.

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/java/src...
File
chrome/android/java/src/org/chromium/chrome/browser/preferences/TextMessageWithLinkAndIconPreference.java
(right):

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/preferences/TextMessageWithLinkAndIconPreference.java:1:
// Copyright 2014 The Chromium Authors. All rights reserved.
2014?! ;)

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/preferences/TextMessageWithLinkAndIconPreference.java:40:
public void setUrl(String url) {
This method is fine, but just FYI, another option would be to use XML attributes
to specify the URL. For example, see the chrome:helpContext attribute on
LearnMorePreference.

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/preferences/TextMessageWithLinkAndIconPreference.java:54:
final SpannableString summaryWithLink = SpanApplier.applySpans(summaryString,
Thought:

Putting the link opening logic inside this class doesn't feel quite right. It
constrains use of this class to cases where we want to open URLs in Chrome. Many
(most) links in Settings do something other than opening a URL, so this isn't
very general. Also, the API is a bit hidden: the text must contain
<link>...</link>, which isn't documented.

Maybe change this class to simply be TextMessageWithIconPreference, and allow
the user of the preference to add ClickableSpans to the summary text and handle
those clicks as they please. (This class still needs to support links by calling
TextView.setMovementMethod(), e.g., but otherwise can be hands-off.)

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/preferences/TextMessageWithLinkAndIconPreference.java:60:
Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(mUrl));
We want to ensure that this intent is opened in Chrome. You could explicitly set
the component/package/class (intent.setComponent(...)), or use

    new TabDelegate(false).launchUrl(url, tabLaunchType);

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/preferences/TextMessageWithLinkAndIconPreference.java:66:
public void updateDrawState(TextPaint textPaint) {
use NoUnderlineClickableSpan and you won't need this method

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/java/src...
File
chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferences.java
(right):

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferences.java:432:
public void showNoticeAboutOtherFormsOfBrowsingHistory() {
This is going to be used in the (near) future, right?

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferences.java:435:
google_summary.setSummary(
google_summary could be null if the google_summary preference was removed
earlier.

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/java/str...
File chrome/android/java/strings/android_chrome_strings.grd (right):

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/java/str...
chrome/android/java/strings/android_chrome_strings.grd:425: You won’t be signed
out of your Google account.
thanks for using curly quotes :)

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/java/str...
chrome/android/java/strings/android_chrome_strings.grd:428: You won’t be signed
out of your Google account. Your Google account may have other forms of browsing
history at <ph name="BEGIN_LINK">&lt;link&gt;</ph>history.google.com<ph
name="END_LINK">&lt;/link&gt;</ph>.
history.google.com should be inside the placeholder tag as well (so there should
be only one ph tag, and it should contain an example <ex> tag).

Also, you could replace history.google.com with %1$s and substitute in the
domain at runtime; but I don't think that's necessary.

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/javatest...
File
chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesTest.java
(right):

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/javatest...
chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesTest.java:305:
assertFalse(google_summary.getSummary().getClass() == SpannableString.class);
use instanceof, which is safer since it'll also catch subclasses

    assertFalse(google_summary.getSummary() instanceof SpannableString);

Note that this check is inherently dangerous though, since a TextView's text
could be a SpannableString for many reasons (e.g. it *previously* contained
spans). It might be safer to cast to SpannableString and call getSpans()

[newt (away), 2016-04-02 01:26:15]

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/java/src...
File
chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferences.java
(right):

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferences.java:128:
private static final String URL_HELP_CENTER =
"Learn more" used to open in the Help & Feedback Android app (on
internal/official builds); now it just opens as a link in the browser. Is this
an intentional change?

[msramek, 2016-04-04 16:21:27]

On 2016/04/02 01:24:03, newt wrote:
> Be sure to run tools/resources/optimize-png-files.sh over the image files, if
> you haven't already.

Done. googleg.png is an official icon, so it was compressed by an amazing 1px
:-) The other one is custom, so it had some effect.

> 
> googleg.png is also being added gogerald@ in
> https://codereview.chromium.org/1840513002/ as
> personalize_google_service_logo.png. Please coordinate to make sure we don't
end
> up with two copies of that image.
> 

I see. I contacted gogerald@. If his CL lands first, I'll rebase and use his
file; if mine, I'll ask him to do the same.

[msramek, 2016-04-04 16:23:12]

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/java/res...
File
chrome/android/java/res/layout/text_message_with_link_and_icon_preference.xml
(right):

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/java/res...
chrome/android/java/res/layout/text_message_with_link_and_icon_preference.xml:8:
<LinearLayout
On 2016/04/02 01:24:03, newt wrote:
> Use a RelativeLayout here to reduce nesting (see
>
http://developer.android.com/training/improving-layouts/optimizing-layout.html)

Done.

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/java/res...
chrome/android/java/res/layout/text_message_with_link_and_icon_preference.xml:10:
xmlns:chrome="http://schemas.android.com/apk/res-auto"
On 2016/04/02 01:24:03, newt wrote:
> chrome namespace isn't needed

Done.

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/java/res...
chrome/android/java/res/layout/text_message_with_link_and_icon_preference.xml:14:
android:gravity="top">
On 2016/04/02 01:24:03, newt wrote:
> not needed / redundant, since the ImageView specifies layout_gravity="top"

Done.

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/java/res...
chrome/android/java/res/layout/text_message_with_link_and_icon_preference.xml:29:
<TextView android:id="@+android:id/title"
On 2016/04/02 01:24:03, newt wrote:
> nit: put android:id on the next line

Done.

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/java/res...
chrome/android/java/res/layout/text_message_with_link_and_icon_preference.xml:34:
<TextView android:id="@+android:id/summary"
On 2016/04/02 01:24:03, newt wrote:
> To support accessibility users, use TextViewWithClickableSpans here.

Done.

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/java/res...
chrome/android/java/res/layout/text_message_with_link_and_icon_preference.xml:37:
android:textAppearance="?android:attr/textAppearanceSmall"
On 2016/04/02 01:24:03, newt wrote:
> Instead of specifying textAppearance and textColor, use
> style="@style/PreferenceTitle" and style="@style/PreferenceSummary". Those
> styles vary according to API level, so these views will look correct on pre-L
> (pre-Material) devices too.

Done.

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/java/src...
File
chrome/android/java/src/org/chromium/chrome/browser/preferences/TextMessageWithLinkAndIconPreference.java
(right):

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/preferences/TextMessageWithLinkAndIconPreference.java:1:
// Copyright 2014 The Chromium Authors. All rights reserved.
On 2016/04/02 01:24:03, newt wrote:
> 2014?! ;)

Done. I guess I should write a presubmit check for this :)

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/preferences/TextMessageWithLinkAndIconPreference.java:40:
public void setUrl(String url) {
On 2016/04/02 01:24:03, newt wrote:
> This method is fine, but just FYI, another option would be to use XML
attributes
> to specify the URL. For example, see the chrome:helpContext attribute on
> LearnMorePreference.

Hmm, yes, I agree it's more elegant that way. But since you suggested below that
we should not hardcode here that the link opens a URL, I'll remove this part
altogether.

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/preferences/TextMessageWithLinkAndIconPreference.java:54:
final SpannableString summaryWithLink = SpanApplier.applySpans(summaryString,
On 2016/04/02 01:24:03, newt wrote:
> Thought:
> 
> Putting the link opening logic inside this class doesn't feel quite right. It
> constrains use of this class to cases where we want to open URLs in Chrome.
Many
> (most) links in Settings do something other than opening a URL, so this isn't
> very general. Also, the API is a bit hidden: the text must contain
> <link>...</link>, which isn't documented.
> 
> Maybe change this class to simply be TextMessageWithIconPreference, and allow
> the user of the preference to add ClickableSpans to the summary text and
handle
> those clicks as they please. (This class still needs to support links by
calling
> TextView.setMovementMethod(), e.g., but otherwise can be hands-off.)

In ClearBrowsingDataPreferences, I have three instances of setSummary(), and I
wanted to avoid adding the boilerplate code with SpanApplier and ClickableSpan
everywhere by encapsulating it here.

As an alternative: I kept the <link></link> parsing logic here, and explained in
the class description how it works. Instead of directly opening an URL, I'm
passing in a Runnable ("setLinkClickDelegate") which can be used to execute an
arbitrary action; that action is then defined in ClearBrowsingData. This is more
flexible.

But if that still doesn't LGTY, I can follow your suggestion.

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/preferences/TextMessageWithLinkAndIconPreference.java:60:
Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(mUrl));
On 2016/04/02 01:24:03, newt wrote:
> We want to ensure that this intent is opened in Chrome. You could explicitly
set
> the component/package/class (intent.setComponent(...)), or use
> 
>     new TabDelegate(false).launchUrl(url, tabLaunchType);

Done. Thanks! I didn't know about TabDelegate.

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/preferences/TextMessageWithLinkAndIconPreference.java:66:
public void updateDrawState(TextPaint textPaint) {
On 2016/04/02 01:24:03, newt wrote:
> use NoUnderlineClickableSpan and you won't need this method

Done.

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/java/src...
File
chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferences.java
(right):

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferences.java:128:
private static final String URL_HELP_CENTER =
On 2016/04/02 01:26:15, newt wrote:
> "Learn more" used to open in the Help & Feedback Android app (on
> internal/official builds); now it just opens as a link in the browser. Is this
> an intentional change?

Done. I actually cannot remember why I originally changed it to be a regular
link, maybe it was to fit TextMessageWithLinkAndIconPreference? But since we've
now changed that to be more general, we can open HelpAndFeedback. Thanks for the
sanity check :)

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferences.java:432:
public void showNoticeAboutOtherFormsOfBrowsingHistory() {
On 2016/04/02 01:24:03, newt wrote:
> This is going to be used in the (near) future, right?

Yes, sorry, I forgot to mention that :) More or less in a follow-up CL. Because
of time constraints I'm landing the UI first (because strings must make it to
the branchpoint), and the connecting logic after that.

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferences.java:435:
google_summary.setSummary(
On 2016/04/02 01:24:03, newt wrote:
> google_summary could be null if the google_summary preference was removed
> earlier.

Done.

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/java/str...
File chrome/android/java/strings/android_chrome_strings.grd (right):

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/java/str...
chrome/android/java/strings/android_chrome_strings.grd:425: You won’t be signed
out of your Google account.
On 2016/04/02 01:24:03, newt wrote:
> thanks for using curly quotes :)

Acknowledged. I just copy-pasted the string above though :)

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/java/str...
chrome/android/java/strings/android_chrome_strings.grd:428: You won’t be signed
out of your Google account. Your Google account may have other forms of browsing
history at <ph name="BEGIN_LINK">&lt;link&gt;</ph>history.google.com<ph
name="END_LINK">&lt;/link&gt;</ph>.
On 2016/04/02 01:24:03, newt wrote:
> http://history.google.com should be inside the placeholder tag as well (so
there should
> be only one ph tag, and it should contain an example <ex> tag).
> 
> Also, you could replace http://history.google.com with %1$s and substitute in
the
> domain at runtime; but I don't think that's necessary.

That makes sense if the link varies, but for hardcoded links, two placeholders
"BEGIN_LINK" and "END_LINK" seem to be standard way in all our .grd files. There
is no need for <ex>, since the value is constant, and it saves the
post-processing code where we would have to insert the link to the string. It
looks correct in the translation console.

If you think the approach is flawed, I'm happy to change it, but it seems to be
the convention.

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/javatest...
File
chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesTest.java
(right):

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/javatest...
chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesTest.java:305:
assertFalse(google_summary.getSummary().getClass() == SpannableString.class);
On 2016/04/02 01:24:03, newt wrote:
> use instanceof, which is safer since it'll also catch subclasses
> 
>     assertFalse(google_summary.getSummary() instanceof SpannableString);
> 
> Note that this check is inherently dangerous though, since a TextView's text
> could be a SpannableString for many reasons (e.g. it *previously* contained
> spans). It might be safer to cast to SpannableString and call getSpans()

Done.

[newt (away), 2016-04-04 21:09:10]

lgtm :)

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/java/src...
File
chrome/android/java/src/org/chromium/chrome/browser/preferences/TextMessageWithLinkAndIconPreference.java
(right):

https://codereview.chromium.org/1845853003/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/preferences/TextMessageWithLinkAndIconPreference.java:54:
final SpannableString summaryWithLink = SpanApplier.applySpans(summaryString,
On 2016/04/04 16:23:12, msramek wrote:
> On 2016/04/02 01:24:03, newt wrote:
> > Thought:
> > 
> > Putting the link opening logic inside this class doesn't feel quite right.
It
> > constrains use of this class to cases where we want to open URLs in Chrome.
> Many
> > (most) links in Settings do something other than opening a URL, so this
isn't
> > very general. Also, the API is a bit hidden: the text must contain
> > <link>...</link>, which isn't documented.
> > 
> > Maybe change this class to simply be TextMessageWithIconPreference, and
allow
> > the user of the preference to add ClickableSpans to the summary text and
> handle
> > those clicks as they please. (This class still needs to support links by
> calling
> > TextView.setMovementMethod(), e.g., but otherwise can be hands-off.)
> 
> In ClearBrowsingDataPreferences, I have three instances of setSummary(), and I
> wanted to avoid adding the boilerplate code with SpanApplier and ClickableSpan
> everywhere by encapsulating it here.
> 
> As an alternative: I kept the <link></link> parsing logic here, and explained
in
> the class description how it works. Instead of directly opening an URL, I'm
> passing in a Runnable ("setLinkClickDelegate") which can be used to execute an
> arbitrary action; that action is then defined in ClearBrowsingData. This is
more
> flexible.
> 
> But if that still doesn't LGTY, I can follow your suggestion.

This is fine with me :)  (I was envisioning that you'd add a method in
ClearBrowsingDataPreferences for creating and applying the ClickableSpan to the
summary text. But this solution is perfectly reasonable too.)

[newt (away), 2016-04-04 21:10:14]

FYI, looks like you'll need to annotate
showNoticeAboutOtherFormsOfBrowsingHistory() with @VisibleForTesting, at least
until it's called by production code, to get the tests passing.

[newt (away), 2016-04-04 21:29:09]

Also, drawable-hdpi/ic_info_grey.png looks blurry. Look into that?

[msramek, 2016-04-05 11:07:58]

On 2016/04/04 21:29:09, newt (no new reviews. mostly) wrote:
> Also, drawable-hdpi/ic_info_grey.png looks blurry. Look into that?

Ooh, thanks for catching that. The "i" was misaligned with the pixel grid. I had
the icons regenerated.

Landing this now. Thanks for a thorough review, as always :-)

[msramek, 2016-04-05 11:08:11]

https://codereview.chromium.org/1845853003/diff/60001/chrome/android/java/src...
File
chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferences.java
(right):

https://codereview.chromium.org/1845853003/diff/60001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferences.java:133:
private static final String HELP_CENTER_CONTEXT = "clear_browsing_data";
Removed this, since it's unused (we refer to the help context below as
R.string.help_context_clear_browsing_data).

[msramek, 2016-04-05 11:08:38]

The CQ bit was checked by msramek@chromium.org

[msramek, 2016-04-05 11:08:38]

The patchset sent to the CQ was uploaded after l-g-t-m from newt@chromium.org
Link to the patchset: https://codereview.chromium.org/1845853003/#ps80001
(title: "Fixed icons, added annotation.")

[commit-bot: I haz the power, 2016-04-05 11:08:48]

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

[commit-bot: I haz the power, 2016-04-05 12:00:19]

Committed patchset #5 (id:80001)

[commit-bot: I haz the power, 2016-04-05 12:01:32]

Description was changed from

==========
Split the footer in ClearBrowsingDataPreferences into two paragraphs

The footer in the CBD preferences currently contains three sentences.
We add a fourth sentence mentioning that the user's Google account may
contain other forms of browsing history.

We then split the footer into two paragraphs, each represented by a new
TextMessageWithLinkPreference class. One paragraph contains the two
sentences related to Google Account and is decorated with the Google "G"
icon. The other one contains general information and is decorated with
an (i) icon.

The "G" paragraph is only shown to signed-in users, and the sentence about
other forms of browsing history is only shown after a callback from web
history service shows that they exist (to be done in a followup CL).
The (i) paragraph is shown permanently.

We also remove the "Learn more" preference at the bottom of the layout,
and instead embed it as a clickable link at the end of the (i) paragraph.

Design doc:
https://docs.google.com/document/d/1ZMDSAd44KmzKhqXPjobZOf9rZezs6VqiBnqpDD0auCU/

Mocks:
https://docs.google.com/presentation/d/1rpR3xB3aYFzXD0U--piuMq3y4XAmoYdawA2HC...

BUG=595332
==========

to

==========
Split the footer in ClearBrowsingDataPreferences into two paragraphs

The footer in the CBD preferences currently contains three sentences.
We add a fourth sentence mentioning that the user's Google account may
contain other forms of browsing history.

We then split the footer into two paragraphs, each represented by a new
TextMessageWithLinkPreference class. One paragraph contains the two
sentences related to Google Account and is decorated with the Google "G"
icon. The other one contains general information and is decorated with
an (i) icon.

The "G" paragraph is only shown to signed-in users, and the sentence about
other forms of browsing history is only shown after a callback from web
history service shows that they exist (to be done in a followup CL).
The (i) paragraph is shown permanently.

We also remove the "Learn more" preference at the bottom of the layout,
and instead embed it as a clickable link at the end of the (i) paragraph.

Design doc:
https://docs.google.com/document/d/1ZMDSAd44KmzKhqXPjobZOf9rZezs6VqiBnqpDD0auCU/

Mocks:
https://docs.google.com/presentation/d/1rpR3xB3aYFzXD0U--piuMq3y4XAmoYdawA2HC...

BUG=595332

Committed: https://crrev.com/07479cd26360d225d4872147bb701b922656a5a8
Cr-Commit-Position: refs/heads/master@{#385154}
==========

[commit-bot: I haz the power, 2016-04-05 12:01:33]

Patchset 5 (id:??) landed as
https://crrev.com/07479cd26360d225d4872147bb701b922656a5a8
Cr-Commit-Position: refs/heads/master@{#385154}