The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/37f7b75bf619d4f853cfb2b7e4e17d1b290d9a9f

commit 37f7b75bf619d4f853cfb2b7e4e17d1b290d9a9f
Author: msramek <msramek@chromium.org>
Date: Thu Mar 17 15:15:56 2016

Fix the build dependency of ProfileSyncService on sync.pb.h

ProfileSyncService requires the file sync/protocol/sync.pb.h to be generated.
However, including browser_sync_browser (which contains ProfileSyncService)
does not guarantee that.

This CL exposes sync/sync.gyp:sync (containing sync.pb.h) as a public
dependency in sync_driver, and sync_driver as a public dependency in
browser_sync_browser, so that any target with the dependency on
browser_sync_browser will also generate sync.pb.h.

BUG= 595332 

Review URL: https://codereview.chromium.org/1808223002

Cr-Commit-Position: refs/heads/master@{#381712}

[modify] https://crrev.com/37f7b75bf619d4f853cfb2b7e4e17d1b290d9a9f/components/browser_sync.gypi
[modify] https://crrev.com/37f7b75bf619d4f853cfb2b7e4e17d1b290d9a9f/components/browser_sync/browser/BUILD.gn
[modify] https://crrev.com/37f7b75bf619d4f853cfb2b7e4e17d1b290d9a9f/components/sync_driver.gypi
[modify] https://crrev.com/37f7b75bf619d4f853cfb2b7e4e17d1b290d9a9f/components/sync_driver/BUILD.gn

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/b6d0d3c36ca322e5f2cb4513198f9d91b5ee53a9

commit b6d0d3c36ca322e5f2cb4513198f9d91b5ee53a9
Author: msramek <msramek@chromium.org>
Date: Thu Mar 17 21:50:37 2016

Add an infrastructure to query history.google.com about other forms of browsing history.

The Clear Browsing Data dialog UI will provide a notice informing the
user that history.google.com stores other forms of browsing history
(such as the search history).

We will only show the notice to those users for whom it is valid. This
will be determined by Sync status, and by a JSON response from
history.google.com [not yet implemented].

See https://docs.google.com/document/d/1ZMDSAd44KmzKhqXPjobZOf9rZezs6VqiBnqpDD0auCU/
for the background.

To communicate between backends (ProfileSyncService, HistoryService) and
frontends on all platforms, we need to put this logic to a component
(especially because of iOS). We create a new component "browsing_data_ui".

BUG= 595332 

Review URL: https://codereview.chromium.org/1806873002

Cr-Commit-Position: refs/heads/master@{#381804}

[add] https://crrev.com/b6d0d3c36ca322e5f2cb4513198f9d91b5ee53a9/components/browsing_data_ui.gypi
[add] https://crrev.com/b6d0d3c36ca322e5f2cb4513198f9d91b5ee53a9/components/browsing_data_ui/BUILD.gn
[add] https://crrev.com/b6d0d3c36ca322e5f2cb4513198f9d91b5ee53a9/components/browsing_data_ui/DEPS
[add] https://crrev.com/b6d0d3c36ca322e5f2cb4513198f9d91b5ee53a9/components/browsing_data_ui/OWNERS
[add] https://crrev.com/b6d0d3c36ca322e5f2cb4513198f9d91b5ee53a9/components/browsing_data_ui/history_notice_utils.cc
[add] https://crrev.com/b6d0d3c36ca322e5f2cb4513198f9d91b5ee53a9/components/browsing_data_ui/history_notice_utils.h
[modify] https://crrev.com/b6d0d3c36ca322e5f2cb4513198f9d91b5ee53a9/components/components.gyp
[modify] https://crrev.com/b6d0d3c36ca322e5f2cb4513198f9d91b5ee53a9/components/history/core/browser/web_history_service.cc
[modify] https://crrev.com/b6d0d3c36ca322e5f2cb4513198f9d91b5ee53a9/components/history/core/browser/web_history_service.h

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/7bbc6599a41fb032cb58a8defcec1fc22af42d35

commit 7bbc6599a41fb032cb58a8defcec1fc22af42d35
Author: msramek <msramek@chromium.org>
Date: Fri Mar 18 14:34:28 2016

Only show the notice about other forms of browsing history if sync is active

We currently show the notice if Sync service is present, but that does not
imply that the user is actually syncing. The Sync service must also be
active.

Furthermore, the notice is to be shown to users without a custom passphrase,
not with it.

BUG= 595332 

Review URL: https://codereview.chromium.org/1814173002

Cr-Commit-Position: refs/heads/master@{#381960}

[modify] https://crrev.com/7bbc6599a41fb032cb58a8defcec1fc22af42d35/components/browsing_data_ui/history_notice_utils.cc

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/ba5b1e9e5644881affcfff2b34ec765883e3d336

commit ba5b1e9e5644881affcfff2b34ec765883e3d336
Author: msramek <msramek@chromium.org>
Date: Wed Mar 30 09:35:46 2016

Retrieve the web&app activity enabled state from WebHistoryService.

This replaces the placeholder method HasOtherFormsOfBrowsingHistory() with
an asynchronous QueryWebAndAppActivity(), and exposes this asynchronous
call through history_notice_utils.

For reference:
Design doc: https://docs.google.com/document/d/1ZMDSAd44KmzKhqXPjobZOf9rZezs6VqiBnqpDD0auCU/
Mocks: https://docs.google.com/presentation/d/1rpR3xB3aYFzXD0U--piuMq3y4XAmoYdawA2HC1cuEjM/

BUG= 595332 

Review URL: https://codereview.chromium.org/1829733002

Cr-Commit-Position: refs/heads/master@{#383940}

[modify] https://crrev.com/ba5b1e9e5644881affcfff2b34ec765883e3d336/components/browsing_data_ui/history_notice_utils.cc
[modify] https://crrev.com/ba5b1e9e5644881affcfff2b34ec765883e3d336/components/browsing_data_ui/history_notice_utils.h
[modify] https://crrev.com/ba5b1e9e5644881affcfff2b34ec765883e3d336/components/history/core/browser/web_history_service.cc
[modify] https://crrev.com/ba5b1e9e5644881affcfff2b34ec765883e3d336/components/history/core/browser/web_history_service.h

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/ba5b1e9e5644881affcfff2b34ec765883e3d336

commit ba5b1e9e5644881affcfff2b34ec765883e3d336
Author: msramek <msramek@chromium.org>
Date: Wed Mar 30 09:35:46 2016

Retrieve the web&app activity enabled state from WebHistoryService.

This replaces the placeholder method HasOtherFormsOfBrowsingHistory() with
an asynchronous QueryWebAndAppActivity(), and exposes this asynchronous
call through history_notice_utils.

For reference:
Design doc: https://docs.google.com/document/d/1ZMDSAd44KmzKhqXPjobZOf9rZezs6VqiBnqpDD0auCU/
Mocks: https://docs.google.com/presentation/d/1rpR3xB3aYFzXD0U--piuMq3y4XAmoYdawA2HC1cuEjM/

BUG= 595332 

Review URL: https://codereview.chromium.org/1829733002

Cr-Commit-Position: refs/heads/master@{#383940}

[modify] https://crrev.com/ba5b1e9e5644881affcfff2b34ec765883e3d336/components/browsing_data_ui/history_notice_utils.cc
[modify] https://crrev.com/ba5b1e9e5644881affcfff2b34ec765883e3d336/components/browsing_data_ui/history_notice_utils.h
[modify] https://crrev.com/ba5b1e9e5644881affcfff2b34ec765883e3d336/components/history/core/browser/web_history_service.cc
[modify] https://crrev.com/ba5b1e9e5644881affcfff2b34ec765883e3d336/components/history/core/browser/web_history_service.h

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/46dcfc017b72cf34e1de7152c3cd42dcad573ecd

commit 46dcfc017b72cf34e1de7152c3cd42dcad573ecd
Author: msramek <msramek@chromium.org>
Date: Thu Mar 31 07:27:23 2016

Add a base dependency to browsing_data_ui.

This is necessary, since we're using base::Callback.

BUG= 595332 

Review URL: https://codereview.chromium.org/1837233005

Cr-Commit-Position: refs/heads/master@{#384209}

[modify] https://crrev.com/46dcfc017b72cf34e1de7152c3cd42dcad573ecd/components/browsing_data_ui.gypi
[modify] https://crrev.com/46dcfc017b72cf34e1de7152c3cd42dcad573ecd/components/browsing_data_ui/BUILD.gn

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/c628f837425d9bb578a29347d36be185662975c1

commit c628f837425d9bb578a29347d36be185662975c1
Author: msramek <msramek@chromium.org>
Date: Fri Apr 01 13:02:52 2016

Add a method to determine when to show a one-time history notice in the CBD dialog

browsing_data_ui::ShouldShowNoticeAboutOtherFormsOfBrowsingHistory
determines when we should show a permanent notice about other forms of
browsing history in the CBD dialog.

However, the one-time notice showed in a new dialog atop of CBD will
have different conditions. Add a separate method to browsing_data_ui
to determine that. Currently, the method defaults to the same value
as the aforementioned one; we are adding it to provide an interface for
the UI code. In the future, it will be updated with correct conditions.

BUG= 595332 

Review URL: https://codereview.chromium.org/1843003003

Cr-Commit-Position: refs/heads/master@{#384567}

[modify] https://crrev.com/c628f837425d9bb578a29347d36be185662975c1/components/browsing_data_ui/history_notice_utils.cc
[modify] https://crrev.com/c628f837425d9bb578a29347d36be185662975c1/components/browsing_data_ui/history_notice_utils.h

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/4b87c75a9276e4290c073e23d06dcc0cdb3ce589

commit 4b87c75a9276e4290c073e23d06dcc0cdb3ce589
Author: msramek <msramek@chromium.org>
Date: Mon Apr 04 13:15:43 2016

Add a notice about other forms of history to the CBD dialog

We are adding messaging to the Clear Browsing Data dialog informing users that their Chrome browsing history (which can be deleted in the dialog) is not the same as other forms of browsing history (such as Google Search history; which can NOT be deleted in the dialog).

There are two messages:

1. In the footer of the dialog. Since there are currently three pieces of information in the Desktop version, we divided them into two paragraphs and added icons: "i" icon for the general information paragraph, and "G" icon for the paragraph about other forms of browsing history (see mocks).

2. A one-time dialog that pops up after the first deletion of browsing history. This is represented by the class ClearBrowserDataHistoryNotice.

Design doc: https://docs.google.com/document/d/1ZMDSAd44KmzKhqXPjobZOf9rZezs6VqiBnqpDD0auCU/
Mocks: https://docs.google.com/presentation/d/1rpR3xB3aYFzXD0U--piuMq3y4XAmoYdawA2HC1cuEjM/

BUG= 595332 

Review URL: https://codereview.chromium.org/1813023002

Cr-Commit-Position: refs/heads/master@{#384891}

[modify] https://crrev.com/4b87c75a9276e4290c073e23d06dcc0cdb3ce589/chrome/app/generated_resources.grd
[add] https://crrev.com/4b87c75a9276e4290c073e23d06dcc0cdb3ce589/chrome/browser/resources/options/clear_browser_data_history_notice_overlay.html
[add] https://crrev.com/4b87c75a9276e4290c073e23d06dcc0cdb3ce589/chrome/browser/resources/options/clear_browser_data_history_notice_overlay.js
[modify] https://crrev.com/4b87c75a9276e4290c073e23d06dcc0cdb3ce589/chrome/browser/resources/options/clear_browser_data_overlay.css
[modify] https://crrev.com/4b87c75a9276e4290c073e23d06dcc0cdb3ce589/chrome/browser/resources/options/clear_browser_data_overlay.html
[modify] https://crrev.com/4b87c75a9276e4290c073e23d06dcc0cdb3ce589/chrome/browser/resources/options/clear_browser_data_overlay.js
[add] https://crrev.com/4b87c75a9276e4290c073e23d06dcc0cdb3ce589/chrome/browser/resources/options/googleg.svg
[add] https://crrev.com/4b87c75a9276e4290c073e23d06dcc0cdb3ce589/chrome/browser/resources/options/info.svg
[modify] https://crrev.com/4b87c75a9276e4290c073e23d06dcc0cdb3ce589/chrome/browser/resources/options/options.html
[modify] https://crrev.com/4b87c75a9276e4290c073e23d06dcc0cdb3ce589/chrome/browser/resources/options/options.js
[modify] https://crrev.com/4b87c75a9276e4290c073e23d06dcc0cdb3ce589/chrome/browser/resources/options/options_bundle.js
[modify] https://crrev.com/4b87c75a9276e4290c073e23d06dcc0cdb3ce589/chrome/browser/ui/BUILD.gn
[modify] https://crrev.com/4b87c75a9276e4290c073e23d06dcc0cdb3ce589/chrome/browser/ui/browser_ui_prefs.cc
[modify] https://crrev.com/4b87c75a9276e4290c073e23d06dcc0cdb3ce589/chrome/browser/ui/webui/options/clear_browser_data_handler.cc
[modify] https://crrev.com/4b87c75a9276e4290c073e23d06dcc0cdb3ce589/chrome/browser/ui/webui/options/clear_browser_data_handler.h
[modify] https://crrev.com/4b87c75a9276e4290c073e23d06dcc0cdb3ce589/chrome/chrome_browser_ui.gypi
[modify] https://crrev.com/4b87c75a9276e4290c073e23d06dcc0cdb3ce589/chrome/common/pref_names.cc
[modify] https://crrev.com/4b87c75a9276e4290c073e23d06dcc0cdb3ce589/chrome/common/pref_names.h

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/5872007bbf986d490d45212060d31b101f2cc281

commit 5872007bbf986d490d45212060d31b101f2cc281
Author: msramek <msramek@chromium.org>
Date: Mon Apr 04 14:34:52 2016

Add a notice about other forms of browsing history to the History WebUI.

Background:
Design doc:
https://docs.google.com/document/d/1ZMDSAd44KmzKhqXPjobZOf9rZezs6VqiBnqpDD0auCU/
Mocks:
https://docs.google.com/presentation/d/1rpR3xB3aYFzXD0U--piuMq3y4XAmoYdawA2HC1cuEjM/

We expand the existing notification that shows whether there are synced
history results. For users who have other forms of browsing history, we
add one more sentence informing them about this fact.

The call to find out about the existence of other forms of browsing history
is asynchronous, just like the call to get web history results. There are
two outcomes:

1. Web history results arrive first. We have to pass the results to
   the frontend immediately, which also shows the first sentence of the
   notification about synced results. When the ping for other forms of
   browsing history returns, we may or may not show the second sentence
   according to the response.

2. The ping for other forms of history returns first. We show the notification
   saying that there are no synced results, but there are other forms
   of browsing history. When the web history results arrive, we update the
   first sentence of the notification accordingly.

To make this simple, we keep the the booleans (one for each sentence)
in BrowsingHistoryHandler, and then call a single JS method that refreshes
the notification according to their state.

Furthermore, to match the mocks, we update the logic on whether or not the
notification should float beside the editing controls. If the notification
contains only a single sentence and it fits, it can float; otherwise, it must
be moved under the editing controls. The current logic in CSS only changes
the notification bar from float: right to float: left. However, in the case
when the notification contains two sentences, but still fits beside the
editing controls, this is not enough; the first sentence could still float
beside editing controls. We must therefore also set float: none on them.
To do that, we replace the 'alone' class on the notification bar with an
'overflow' class on top controls, so that we can influence the behavior of
both notification bar and editing controls.

BUG= 595332 

Review URL: https://codereview.chromium.org/1838333004

Cr-Commit-Position: refs/heads/master@{#384903}

[modify] https://crrev.com/5872007bbf986d490d45212060d31b101f2cc281/chrome/browser/resources/history/history.css
[modify] https://crrev.com/5872007bbf986d490d45212060d31b101f2cc281/chrome/browser/resources/history/history.js
[modify] https://crrev.com/5872007bbf986d490d45212060d31b101f2cc281/chrome/browser/resources/history/history_mobile.css
[modify] https://crrev.com/5872007bbf986d490d45212060d31b101f2cc281/chrome/browser/resources/md_history/history.js
[modify] https://crrev.com/5872007bbf986d490d45212060d31b101f2cc281/chrome/browser/ui/webui/browsing_history_handler.cc
[modify] https://crrev.com/5872007bbf986d490d45212060d31b101f2cc281/chrome/browser/ui/webui/browsing_history_handler.h
[modify] https://crrev.com/5872007bbf986d490d45212060d31b101f2cc281/chrome/browser/ui/webui/history_ui.cc
[modify] https://crrev.com/5872007bbf986d490d45212060d31b101f2cc281/chrome/test/data/webui/history_browsertest.js
[modify] https://crrev.com/5872007bbf986d490d45212060d31b101f2cc281/components/history_strings.grdp

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/7b1d959bc4e1cae64abdeff2c5baeb9c38c3813b

commit 7b1d959bc4e1cae64abdeff2c5baeb9c38c3813b
Author: msramek <msramek@chromium.org>
Date: Mon Apr 04 15:55:06 2016

Provide an explicit 2nd parameter to historyView.showNotification()

HistoryView.prototype.showNotification() requires two parameters,
but the callsite in HistoryView.prototype.showWebHistoryNotification,
added in https://codereview.chromium.org/1838333004/, only passes one.

This is functionally equivalent, since the second parameter should be
"false". However, this shows as an error on the Closure compiler.

TBR=dbeam@chromium.org,jyquinn@chromium.org,sky@chromium.org
BUG= 595332 

Review URL: https://codereview.chromium.org/1856773002

Cr-Commit-Position: refs/heads/master@{#384918}

[modify] https://crrev.com/7b1d959bc4e1cae64abdeff2c5baeb9c38c3813b/chrome/browser/resources/history/history.js

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/07479cd26360d225d4872147bb701b922656a5a8

commit 07479cd26360d225d4872147bb701b922656a5a8
Author: msramek <msramek@chromium.org>
Date: Tue Apr 05 12:00:10 2016

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 

Review URL: https://codereview.chromium.org/1845853003

Cr-Commit-Position: refs/heads/master@{#385154}

[add] https://crrev.com/07479cd26360d225d4872147bb701b922656a5a8/chrome/android/java/res/drawable-hdpi/googleg.png
[add] https://crrev.com/07479cd26360d225d4872147bb701b922656a5a8/chrome/android/java/res/drawable-hdpi/ic_info_grey.png
[add] https://crrev.com/07479cd26360d225d4872147bb701b922656a5a8/chrome/android/java/res/drawable-mdpi/googleg.png
[add] https://crrev.com/07479cd26360d225d4872147bb701b922656a5a8/chrome/android/java/res/drawable-mdpi/ic_info_grey.png
[add] https://crrev.com/07479cd26360d225d4872147bb701b922656a5a8/chrome/android/java/res/drawable-xhdpi/googleg.png
[add] https://crrev.com/07479cd26360d225d4872147bb701b922656a5a8/chrome/android/java/res/drawable-xhdpi/ic_info_grey.png
[add] https://crrev.com/07479cd26360d225d4872147bb701b922656a5a8/chrome/android/java/res/drawable-xxhdpi/googleg.png
[add] https://crrev.com/07479cd26360d225d4872147bb701b922656a5a8/chrome/android/java/res/drawable-xxhdpi/ic_info_grey.png
[add] https://crrev.com/07479cd26360d225d4872147bb701b922656a5a8/chrome/android/java/res/drawable-xxxhdpi/googleg.png
[add] https://crrev.com/07479cd26360d225d4872147bb701b922656a5a8/chrome/android/java/res/drawable-xxxhdpi/ic_info_grey.png
[add] https://crrev.com/07479cd26360d225d4872147bb701b922656a5a8/chrome/android/java/res/layout/text_message_with_link_and_icon_preference.xml
[modify] https://crrev.com/07479cd26360d225d4872147bb701b922656a5a8/chrome/android/java/res/xml/clear_browsing_data_preferences.xml
[add] https://crrev.com/07479cd26360d225d4872147bb701b922656a5a8/chrome/android/java/src/org/chromium/chrome/browser/preferences/TextMessageWithLinkAndIconPreference.java
[modify] https://crrev.com/07479cd26360d225d4872147bb701b922656a5a8/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferences.java
[modify] https://crrev.com/07479cd26360d225d4872147bb701b922656a5a8/chrome/android/java/strings/android_chrome_strings.grd
[modify] https://crrev.com/07479cd26360d225d4872147bb701b922656a5a8/chrome/android/java_sources.gni
[modify] https://crrev.com/07479cd26360d225d4872147bb701b922656a5a8/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesTest.java

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/59a92a51fe90d2ab15d05ed8caaae769b2c2e13a

commit 59a92a51fe90d2ab15d05ed8caaae769b2c2e13a
Author: msramek <msramek@chromium.org>
Date: Wed Apr 06 20:04:09 2016

Add an annotation to the history.g.c link in ClearBrowsingDataPreferences

The history.google.com link referenced from the ClearBrowserDataHandler
on desktop adds the parameter utm_source=chrome_cbd to determine that
the source is the Clear Browsing Data dialog.

This CL adds the same parameter to the link in ClearBrowsingDataPreferences
on Android.

BUG= 595332 

Review URL: https://codereview.chromium.org/1866033002

Cr-Commit-Position: refs/heads/master@{#385534}

[modify] https://crrev.com/59a92a51fe90d2ab15d05ed8caaae769b2c2e13a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferences.java

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/a5f963e751f3287d9741d24e1b87ba076b667371

commit a5f963e751f3287d9741d24e1b87ba076b667371
Author: msramek <msramek@chromium.org>
Date: Thu Apr 07 08:47:59 2016

Add an "Ok, got it" string for the notice about other forms of history.

BUG= 595332 

Review URL: https://codereview.chromium.org/1867603002

Cr-Commit-Position: refs/heads/master@{#385695}

[modify] https://crrev.com/a5f963e751f3287d9741d24e1b87ba076b667371/chrome/app/generated_resources.grd

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/b11f49b725456660d78267f78e4b10103c1ba20d

commit b11f49b725456660d78267f78e4b10103c1ba20d
Author: msramek <msramek@chromium.org>
Date: Fri Apr 08 12:08:47 2016

Add a one-time notice about other forms of browsing history.

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

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

When the user deletes their browsing history in ClearBrowsingDataPreferences,
we might show them a dialog about other forms of browsing history. The dialog
is only shown once per profile (the shown state is stored in SharedPreferences)
and is only shown to users for which the web history service finds that it
is relevant. The web history service will have to make an asynchronous
request to find this out, and will inform us by calling
enableDialogAboutOtherFormsOfBrowsingHistory().

The web history service request and asynchronous callback is to be done
in a follow-up CL.

BUG= 595332 

Review URL: https://codereview.chromium.org/1859373002

Cr-Commit-Position: refs/heads/master@{#386050}

[add] https://crrev.com/b11f49b725456660d78267f78e4b10103c1ba20d/chrome/android/java/res/layout/other_forms_of_history_dialog.xml
[modify] https://crrev.com/b11f49b725456660d78267f78e4b10103c1ba20d/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferences.java
[add] https://crrev.com/b11f49b725456660d78267f78e4b10103c1ba20d/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/OtherFormsOfHistoryDialogFragment.java
[modify] https://crrev.com/b11f49b725456660d78267f78e4b10103c1ba20d/chrome/android/java/strings/android_chrome_strings.grd
[modify] https://crrev.com/b11f49b725456660d78267f78e4b10103c1ba20d/chrome/android/java_sources.gni
[modify] https://crrev.com/b11f49b725456660d78267f78e4b10103c1ba20d/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesTest.java

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/9148ef94084fbfb94f5ef9404e7326059cc2d548

commit 9148ef94084fbfb94f5ef9404e7326059cc2d548
Author: msramek <msramek@chromium.org>
Date: Fri Apr 08 18:41:49 2016

Move the nonstatic members under static ones in ClearBrowsingDataPreferences

This is a followup to https://chromiumcodereview.appspot.com/1859373002/.

BUG= 595332 

Review URL: https://codereview.chromium.org/1875633003

Cr-Commit-Position: refs/heads/master@{#386137}

[modify] https://crrev.com/9148ef94084fbfb94f5ef9404e7326059cc2d548/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferences.java

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/cf14b5cb372037e46ffc3bae09cddd2af1ca4b51

commit cf14b5cb372037e46ffc3bae09cddd2af1ca4b51
Author: msramek <msramek@chromium.org>
Date: Fri Apr 08 18:44:03 2016

Connect the "other forms of browsing history" frontend on Android to backend.

When created, ClearBrowsingDataPreferences asks through
the PrefServiceBridge whether it should display the notice
about other forms of browsing history in the footer and in
the dialog. The response is returned asynchronously.

BUG= 595332 

Review URL: https://codereview.chromium.org/1870703002

Cr-Commit-Position: refs/heads/master@{#386140}

[modify] https://crrev.com/cf14b5cb372037e46ffc3bae09cddd2af1ca4b51/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
[modify] https://crrev.com/cf14b5cb372037e46ffc3bae09cddd2af1ca4b51/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferences.java
[modify] https://crrev.com/cf14b5cb372037e46ffc3bae09cddd2af1ca4b51/chrome/browser/android/preferences/pref_service_bridge.cc
[modify] https://crrev.com/cf14b5cb372037e46ffc3bae09cddd2af1ca4b51/chrome/chrome_browser.gypi

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/3a81a13676c458976f3125cc68d937ea020f7327

commit 3a81a13676c458976f3125cc68d937ea020f7327
Author: msramek <msramek@chromium.org>
Date: Mon May 02 13:22:36 2016

Expand the footer in the material design Clear Browsing Data dialog.

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

The footer in Clear Browsing Data dialog now contains three sentences.
1. Static sentence informing the user that all browsing data can be cleared.
2. A sentence about synced data, only shown when Sync is active.
3. A sentence about other forms of browsing history, only shown when
   browsing_data_ui::ShouldShowNoticeAboutOtherFormsOfBrowsingHistory is true.

ClearBrowsingDataHandler listens to ProfileSyncService and adjust sentence #2
immediately. The condition for #3 is only checked at initialization.

As per mocks, we split the footer into two paragraphs - one containing
sentences #1 and #2 annotated with an (i) icon, and one for sentence #3
annotated with a "G" icon.

BUG= 595332 
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:closure_compilation

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

[modify] https://crrev.com/3a81a13676c458976f3125cc68d937ea020f7327/chrome/app/resources/locale_settings.grd
[modify] https://crrev.com/3a81a13676c458976f3125cc68d937ea020f7327/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_browser_proxy.js
[modify] https://crrev.com/3a81a13676c458976f3125cc68d937ea020f7327/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.html
[modify] https://crrev.com/3a81a13676c458976f3125cc68d937ea020f7327/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.js
[modify] https://crrev.com/3a81a13676c458976f3125cc68d937ea020f7327/chrome/browser/resources/settings/icons.html
[modify] https://crrev.com/3a81a13676c458976f3125cc68d937ea020f7327/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
[modify] https://crrev.com/3a81a13676c458976f3125cc68d937ea020f7327/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc
[modify] https://crrev.com/3a81a13676c458976f3125cc68d937ea020f7327/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.h
[modify] https://crrev.com/3a81a13676c458976f3125cc68d937ea020f7327/chrome/test/data/webui/settings/privacy_page_test.js

The following revision refers to this bug:
  https://chrome-internal.googlesource.com/chrome/ios_internal.git/+/83ebe5782e2e1c78062ff95cae5cb27a6afd4e02

commit 83ebe5782e2e1c78062ff95cae5cb27a6afd4e02
Author: msarda <msarda@google.com>
Date: Wed May 25 16:59:09 2016

The following revision refers to this bug:
  https://chrome-internal.googlesource.com/chrome/ios_internal.git/+/1a8373f909835e883736867ce27d5268df73fc2e

commit 1a8373f909835e883736867ce27d5268df73fc2e
Author: msarda <msarda@google.com>
Date: Wed May 25 16:59:09 2016

Note: The merge approval for this merge comes from https://bugs.chromium.org/p/chromium/issues/detail?id=614652#c14 (a different bug).

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/59db76ef6f2b5d45b17aeb1f6cc48c083178df10

commit 59db76ef6f2b5d45b17aeb1f6cc48c083178df10
Author: msramek <msramek@chromium.org>
Date: Mon Jul 18 19:07:24 2016

Add a footer about other forms of history to the MD history page.

This is a followup to https://codereview.chromium.org/1838333004/ where
it was added to the history WebUI.

Folio: https://folio.googleplex.com/chromenarnia/Clear%20Browsing%20Data%20&%20History/MD%20Update
What's not seen on Folio, but was discussed offline: Although it's
positioned in the side bar, the footer should not behave like
a paper-item. Only the link itself should be clickable.

Update: https://screenshot.googleplex.com/s2yAqZ05yXT - this is
a new screenshot after the side-bar layout changed (used to be static,
after https://codereview.chromium.org/2020963002/ it's hidden
under the hamburger menu.

BUG= 595332 
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

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

[modify] https://crrev.com/59db76ef6f2b5d45b17aeb1f6cc48c083178df10/chrome/app/resources/locale_settings.grd
[modify] https://crrev.com/59db76ef6f2b5d45b17aeb1f6cc48c083178df10/chrome/browser/resources/md_history/app.js
[modify] https://crrev.com/59db76ef6f2b5d45b17aeb1f6cc48c083178df10/chrome/browser/resources/md_history/history.js
[modify] https://crrev.com/59db76ef6f2b5d45b17aeb1f6cc48c083178df10/chrome/browser/resources/md_history/side_bar.html
[modify] https://crrev.com/59db76ef6f2b5d45b17aeb1f6cc48c083178df10/chrome/browser/resources/md_history/side_bar.js
[modify] https://crrev.com/59db76ef6f2b5d45b17aeb1f6cc48c083178df10/chrome/browser/ui/webui/md_history_ui.cc

That was the last pending CL for MD settings. This is finally done.