| Index: chrome/browser/android/preferences/pref_service_bridge.cc
|
| diff --git a/chrome/browser/android/preferences/pref_service_bridge.cc b/chrome/browser/android/preferences/pref_service_bridge.cc
|
| index d4bc0a8b85a4041b7aff7dabbe620dadcb12588f..3b3cad73b5da11ee76375cf090fd41eb3ad23bc1 100644
|
| --- a/chrome/browser/android/preferences/pref_service_bridge.cc
|
| +++ b/chrome/browser/android/preferences/pref_service_bridge.cc
|
| @@ -37,8 +37,10 @@
|
| #include "chrome/browser/sync/profile_sync_service_factory.h"
|
| #include "chrome/browser/translate/chrome_translate_client.h"
|
| #include "chrome/browser/ui/android/android_about_app_info.h"
|
| +#include "chrome/common/channel_info.h"
|
| #include "chrome/common/pref_names.h"
|
| #include "chrome/grit/locale_settings.h"
|
| +#include "components/browser_sync/browser/profile_sync_service.h"
|
| #include "components/browsing_data_ui/history_notice_utils.h"
|
| #include "components/content_settings/core/browser/host_content_settings_map.h"
|
| #include "components/content_settings/core/common/content_settings.h"
|
| @@ -56,6 +58,7 @@
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/user_metrics.h"
|
| #include "jni/PrefServiceBridge_jni.h"
|
| +#include "ui/base/device_form_factor.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
|
|
| using base::android::AttachCurrentThread;
|
| @@ -696,6 +699,8 @@ static void RequestInfoAboutOtherFormsOfBrowsingHistory(
|
| browsing_data_ui::ShouldPopupDialogAboutOtherFormsOfBrowsingHistory(
|
| ProfileSyncServiceFactory::GetForProfile(GetOriginalProfile()),
|
| WebHistoryServiceFactory::GetForProfile(GetOriginalProfile()),
|
| + chrome::GetChannel(),
|
| + ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET,
|
| base::Bind(&EnableDialogAboutOtherFormsOfBrowsingHistory,
|
| base::Owned(new ScopedJavaGlobalRef<jobject>(env, listener))));
|
| }
|
|
|