chrome/browser/ui/webui/options/clear_browser_data_handler.cc - Issue 1983073002: Query the existence other forms of browsing history.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/options/clear_browser_data_handler.cc

Issue 1983073002: Query the existence other forms of browsing history. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressed comments, re-added protobuf Created 4 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/android/preferences/pref_service_bridge.cc ('k') | components/BUILD.gn » ('j') | components/browsing_data_ui/history_notice_utils.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/clear_browser_data_handler.cc

diff --git a/chrome/browser/ui/webui/options/clear_browser_data_handler.cc b/chrome/browser/ui/webui/options/clear_browser_data_handler.cc

index ae3433804f91ce1f9adb7faafc547ffce72f4f17..6d4ffd8e60c5f965714adf8ad632208b670b98d5 100644

--- a/chrome/browser/ui/webui/options/clear_browser_data_handler.cc

+++ b/chrome/browser/ui/webui/options/clear_browser_data_handler.cc

@@ -34,6 +34,7 @@

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/sync/profile_sync_service_factory.h"

#include "chrome/browser/ui/accelerator_utils.h"

+#include "chrome/common/channel_info.h"

#include "chrome/common/pref_names.h"

#include "chrome/grit/generated_resources.h"

#include "chrome/grit/locale_settings.h"

@@ -43,6 +44,7 @@

#include "content/public/browser/notification_details.h"

#include "content/public/browser/web_ui.h"

#include "ui/base/accelerators/accelerator.h"

+#include "ui/base/device_form_factor.h"

#include "ui/base/l10n/l10n_util.h"

#include "ui/events/keycodes/keyboard_codes.h"

@@ -408,6 +410,8 @@ void ClearBrowserDataHandler::RefreshHistoryNotice() {

browsing_data_ui::ShouldPopupDialogAboutOtherFormsOfBrowsingHistory(

sync_service_,

WebHistoryServiceFactory::GetForProfile(Profile::FromWebUI(web_ui())),

+ chrome::GetChannel(),

+ ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET,

base::Bind(&ClearBrowserDataHandler::UpdateHistoryDeletionDialog,

weak_ptr_factory_.GetWeakPtr()));

}

« no previous file with comments | « chrome/browser/android/preferences/pref_service_bridge.cc ('k') | components/BUILD.gn » ('j') | components/browsing_data_ui/history_notice_utils.h » ('J')