Move desktop in-product help code out of build flag
Desktop in-product help code was built only when a flag,
ENABLE_DESKTOP_IN_PRODUCT_HELP, was enabled. This was a holdover from
the original desktop IPH project which is no longer active. It is more
appopriate to gate this behind a base::Feature flag instead.
This CL makes all curerntly active IPH code build on all desktop
platforms without using a build flag.
The original build flag is renamed to
ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP, set to false by default, and
the old IPH project is kept behind this. This was done since this code
violates layering: it resides in chrome/browser, but directly accesses
code in chrome/browser/ui/ and chrome/browser/ui/views.
Bug: 938720
Change-Id: I3850f61a8802c320d9cc0aa8d49721ccdb711d93
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1643891
Reviewed-by: Scott Violet <[email protected]>
Reviewed-by: Tommy Nyquist <[email protected]>
Reviewed-by: Peter Kasting <[email protected]>
Commit-Queue: Collin Baker <[email protected]>
Cr-Commit-Position: refs/heads/master@{#666748}
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 022da24..5db0e97 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -4132,7 +4132,7 @@
]
}
- if (enable_desktop_in_product_help) {
+ if (enable_legacy_desktop_in_product_help) {
sources += [
"feature_engagement/bookmark/bookmark_tracker.cc",
"feature_engagement/bookmark/bookmark_tracker.h",
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 3848be2..fbfb979 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -3518,12 +3518,14 @@
FEATURE_VALUE_TYPE(printing::features::kEnableCustomMacPaperSizes)},
#endif
-#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
+ defined(OS_CHROMEOS)
{"enable-reopen-tab-in-product-help",
flag_descriptions::kReopenTabInProductHelpName,
flag_descriptions::kReopenTabInProductHelpDescription, kOsDesktop,
FEATURE_VALUE_TYPE(feature_engagement::kIPHReopenTabFeature)},
-#endif // BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ||
+ // defined(OS_CHROMEOS)
{"enable-audio-focus-enforcement",
flag_descriptions::kEnableAudioFocusEnforcementName,
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
index 041dfc1b..b159d85 100644
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -3255,6 +3255,11 @@
"InstallableInkDrop is part of an InkDrop refactoring effort. This enables "
"the pilot implementation where available.";
+const char kReopenTabInProductHelpName[] = "Reopen tab in-product help";
+const char kReopenTabInProductHelpDescription[] =
+ "Enable in-product help that guides a user to reopen a tab if it looks "
+ "like they accidentally closed it.";
+
#endif // defined(TOOLKIT_VIEWS)
// Random platform combinations -----------------------------------------------
@@ -3372,15 +3377,6 @@
#endif // defined(TOOLKIT_VIEWS) || defined(OS_ANDROID)
-#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
-
-const char kReopenTabInProductHelpName[] = "Reopen tab in-product help";
-const char kReopenTabInProductHelpDescription[] =
- "Enable in-product help that guides a user to reopen a tab if it looks "
- "like they accidentally closed it.";
-
-#endif // BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
-
#if defined(WEBRTC_USE_PIPEWIRE)
extern const char kWebrtcPipeWireCapturerName[] = "WebRTC PipeWire support";
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
index 76aef53..7264790 100644
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -10,7 +10,6 @@
#include "build/build_config.h"
#include "build/buildflag.h"
#include "chrome/common/buildflags.h"
-#include "components/feature_engagement/buildflags.h"
#include "components/nacl/common/buildflags.h"
#include "device/vr/buildflags/buildflags.h"
#include "media/media_buildflags.h"
@@ -1958,6 +1957,9 @@
extern const char kInstallableInkDropName[];
extern const char kInstallableInkDropDescription[];
+extern const char kReopenTabInProductHelpName[];
+extern const char kReopenTabInProductHelpDescription[];
+
#endif // defined(TOOLKIT_VIEWS)
// Random platform combinations -----------------------------------------------
@@ -2053,12 +2055,6 @@
#endif // defined(TOOLKIT_VIEWS) || defined(OS_ANDROID)
-#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
-
-extern const char kReopenTabInProductHelpName[];
-extern const char kReopenTabInProductHelpDescription[];
-
-#endif // BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
extern const char kAvoidFlashBetweenNavigationName[];
extern const char kAvoidFlahsBetweenNavigationDescription[];
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 65cbfff9..fc3b400 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -192,7 +192,7 @@
#include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h"
#endif
-#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
+#if BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP)
#include "chrome/browser/feature_engagement/session_duration_updater.h"
#endif
@@ -742,7 +742,7 @@
web_app::WebAppProvider::RegisterProfilePrefs(registry);
#endif // BUILDFLAG(ENABLE_EXTENSIONS)
-#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
+#if BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP)
feature_engagement::SessionDurationUpdater::RegisterProfilePrefs(registry);
#endif
diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
index bd0a4453..682fea5 100644
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -132,7 +132,7 @@
#include "chrome/browser/captive_portal/captive_portal_service_factory.h"
#endif
-#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
+#if BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP)
#include "chrome/browser/feature_engagement/bookmark/bookmark_tracker_factory.h"
#include "chrome/browser/feature_engagement/incognito_window/incognito_window_tracker_factory.h"
#include "chrome/browser/feature_engagement/new_tab/new_tab_tracker_factory.h"
@@ -275,7 +275,7 @@
extensions::VerifyTrustAPI::GetFactoryInstance();
#endif
FaviconServiceFactory::GetInstance();
-#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
+#if BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP)
feature_engagement::BookmarkTrackerFactory::GetInstance();
feature_engagement::IncognitoWindowTrackerFactory::GetInstance();
feature_engagement::NewTabTrackerFactory::GetInstance();
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index 6c7069a..d88a40b2 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -906,6 +906,15 @@
"hid/hid_chooser.h",
"hung_renderer/hung_renderer_core.cc",
"hung_renderer/hung_renderer_core.h",
+ "in_product_help/active_tab_tracker.cc",
+ "in_product_help/active_tab_tracker.h",
+ "in_product_help/in_product_help.h",
+ "in_product_help/reopen_tab_in_product_help.cc",
+ "in_product_help/reopen_tab_in_product_help.h",
+ "in_product_help/reopen_tab_in_product_help_factory.cc",
+ "in_product_help/reopen_tab_in_product_help_factory.h",
+ "in_product_help/reopen_tab_in_product_help_trigger.cc",
+ "in_product_help/reopen_tab_in_product_help_trigger.h",
"intent_picker_tab_helper.cc",
"intent_picker_tab_helper.h",
"javascript_dialogs/javascript_dialog_views.cc",
@@ -2624,6 +2633,8 @@
"views/feature_promos/feature_promo_bubble_timeout.h",
"views/feature_promos/feature_promo_bubble_view.cc",
"views/feature_promos/feature_promo_bubble_view.h",
+ "views/feature_promos/reopen_tab_promo_controller.cc",
+ "views/feature_promos/reopen_tab_promo_controller.h",
"views/find_bar_host.cc",
"views/find_bar_host.h",
"views/find_bar_view.cc",
@@ -3544,22 +3555,6 @@
]
}
- if (enable_desktop_in_product_help) {
- sources += [
- "in_product_help/active_tab_tracker.cc",
- "in_product_help/active_tab_tracker.h",
- "in_product_help/in_product_help.h",
- "in_product_help/reopen_tab_in_product_help.cc",
- "in_product_help/reopen_tab_in_product_help.h",
- "in_product_help/reopen_tab_in_product_help_factory.cc",
- "in_product_help/reopen_tab_in_product_help_factory.h",
- "in_product_help/reopen_tab_in_product_help_trigger.cc",
- "in_product_help/reopen_tab_in_product_help_trigger.h",
- "views/feature_promos/reopen_tab_promo_controller.cc",
- "views/feature_promos/reopen_tab_promo_controller.h",
- ]
- }
-
if (enable_extensions) {
deps += [
"//apps",
diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc
index 66dc103..a004ea38 100644
--- a/chrome/browser/ui/browser_command_controller.cc
+++ b/chrome/browser/ui/browser_command_controller.cc
@@ -85,7 +85,7 @@
#include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
#endif
-#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
+#if BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP)
#include "chrome/browser/feature_engagement/bookmark/bookmark_tracker.h"
#include "chrome/browser/feature_engagement/bookmark/bookmark_tracker_factory.h"
#include "chrome/browser/feature_engagement/new_tab/new_tab_tracker.h"
@@ -387,7 +387,7 @@
break;
case IDC_NEW_TAB: {
NewTab(browser_);
-#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
+#if BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP)
// This is not in NewTab() to avoid tracking programmatic creation of new
// tabs by extensions.
auto* new_tab_tracker =
@@ -497,7 +497,7 @@
SavePage(browser_);
break;
case IDC_BOOKMARK_PAGE:
-#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
+#if BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP)
feature_engagement::BookmarkTrackerFactory::GetInstance()
->GetForProfile(profile())
->OnBookmarkAdded();
@@ -505,7 +505,7 @@
BookmarkCurrentPageAllowingExtensionOverrides(browser_);
break;
case IDC_BOOKMARK_ALL_TABS:
-#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
+#if BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP)
feature_engagement::BookmarkTrackerFactory::GetInstance()
->GetForProfile(profile())
->OnBookmarkAdded();
diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc
index aa64b3d..0838033 100644
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -128,7 +128,7 @@
#include "components/rlz/rlz_tracker.h" // nogncheck
#endif
-#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
+#if BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP)
#include "chrome/browser/feature_engagement/incognito_window/incognito_window_tracker.h"
#include "chrome/browser/feature_engagement/incognito_window/incognito_window_tracker_factory.h"
#endif
@@ -608,7 +608,7 @@
}
void NewIncognitoWindow(Profile* profile) {
-#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
+#if BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP)
feature_engagement::IncognitoWindowTrackerFactory::GetInstance()
->GetForProfile(profile)
->OnIncognitoWindowOpened();
@@ -629,12 +629,10 @@
UMA_HISTOGRAM_ENUMERATION("Tab.NewTab", TabStripModel::NEW_TAB_COMMAND,
TabStripModel::NEW_TAB_ENUM_COUNT);
-#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
// Notify IPH that new tab was opened.
auto* reopen_tab_iph =
ReopenTabInProductHelpFactory::GetForProfile(browser->profile());
reopen_tab_iph->NewTabOpened();
-#endif
if (browser->is_type_tabbed()) {
AddTabAt(browser, GURL(), -1, true);
diff --git a/chrome/browser/ui/browser_tab_restorer.cc b/chrome/browser/ui/browser_tab_restorer.cc
index 4ac02c8..deb5acb 100644
--- a/chrome/browser/ui/browser_tab_restorer.cc
+++ b/chrome/browser/ui/browser_tab_restorer.cc
@@ -103,11 +103,9 @@
void RestoreTab(Browser* browser) {
base::RecordAction(base::UserMetricsAction("RestoreTab"));
-#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
auto* reopen_tab_iph =
ReopenTabInProductHelpFactory::GetForProfile(browser->profile());
reopen_tab_iph->TabReopened();
-#endif
sessions::TabRestoreService* service =
TabRestoreServiceFactory::GetForProfile(browser->profile());
diff --git a/chrome/browser/ui/browser_window.h b/chrome/browser/ui/browser_window.h
index 3b6db2e..3acdf53 100644
--- a/chrome/browser/ui/browser_window.h
+++ b/chrome/browser/ui/browser_window.h
@@ -19,9 +19,9 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_dialogs.h"
#include "chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.h"
+#include "chrome/browser/ui/in_product_help/in_product_help.h"
#include "chrome/common/buildflags.h"
#include "components/content_settings/core/common/content_settings_types.h"
-#include "components/feature_engagement/buildflags.h"
#include "components/signin/core/browser/signin_header_helper.h"
#include "components/translate/core/common/translate_errors.h"
#include "ui/base/base_window.h"
@@ -32,10 +32,6 @@
#error This file should only be included on desktop.
#endif
-#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
-#include "chrome/browser/ui/in_product_help/in_product_help.h"
-#endif // BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
-
class Browser;
class DownloadShelf;
class ExclusiveAccessContext;
@@ -465,10 +461,8 @@
const base::Callback<void(ImeWarningBubblePermissionStatus status)>&
callback) = 0;
-#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
// Shows in-product help for the given feature.
virtual void ShowInProductHelpPromo(InProductHelpFeature iph_feature) = 0;
-#endif
// Returns the platform-specific ID of the workspace the browser window
// currently resides in.
diff --git a/chrome/browser/ui/omnibox/chrome_omnibox_client.cc b/chrome/browser/ui/omnibox/chrome_omnibox_client.cc
index 1dfa25e..d5c7ea7 100644
--- a/chrome/browser/ui/omnibox/chrome_omnibox_client.cc
+++ b/chrome/browser/ui/omnibox/chrome_omnibox_client.cc
@@ -78,7 +78,7 @@
#include "ui/gfx/vector_icon_types.h"
#include "url/gurl.h"
-#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
+#if BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP)
#include "chrome/browser/feature_engagement/new_tab/new_tab_tracker.h"
#include "chrome/browser/feature_engagement/new_tab/new_tab_tracker_factory.h"
#endif
@@ -463,7 +463,7 @@
// We could go further to try to analyze the difference between the previous
// and current URLs, but users edit URLs rarely enough that this is a
// reasonable approximation.
-#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
+#if BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP)
if (controller_->GetLocationBarModel()->ShouldDisplayURL()) {
feature_engagement::NewTabTrackerFactory::GetInstance()
->GetForProfile(profile_)
diff --git a/chrome/browser/ui/tabs/tab_strip_model.cc b/chrome/browser/ui/tabs/tab_strip_model.cc
index c5c87a4..c4d3551 100644
--- a/chrome/browser/ui/tabs/tab_strip_model.cc
+++ b/chrome/browser/ui/tabs/tab_strip_model.cc
@@ -45,7 +45,7 @@
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_observer.h"
-#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
+#if BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP)
#include "chrome/browser/feature_engagement/new_tab/new_tab_tracker.h"
#include "chrome/browser/feature_engagement/new_tab/new_tab_tracker_factory.h"
#endif
@@ -1126,7 +1126,7 @@
TabStripModel::NEW_TAB_ENUM_COUNT);
delegate()->AddTabAt(GURL(), context_index + 1, true,
GetTabGroupForTab(context_index));
-#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
+#if BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP)
auto* new_tab_tracker =
feature_engagement::NewTabTrackerFactory::GetInstance()
->GetForProfile(profile_);
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index 02d72d64..ae49232 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -56,6 +56,8 @@
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/browser_window_state.h"
+#include "chrome/browser/ui/in_product_help/reopen_tab_in_product_help.h"
+#include "chrome/browser/ui/in_product_help/reopen_tab_in_product_help_factory.h"
#include "chrome/browser/ui/layout_constants.h"
#include "chrome/browser/ui/recently_audible_helper.h"
#include "chrome/browser/ui/sad_tab_helper.h"
@@ -204,11 +206,6 @@
#include "ui/views/win/scoped_fullscreen_visibility.h"
#endif
-#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
-#include "chrome/browser/ui/in_product_help/reopen_tab_in_product_help.h"
-#include "chrome/browser/ui/in_product_help/reopen_tab_in_product_help_factory.h"
-#endif // BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
-
#if BUILDFLAG(ENABLE_ONE_CLICK_SIGNIN)
#include "chrome/browser/ui/sync/one_click_signin_links_delegate_impl.h"
#include "chrome/browser/ui/views/sync/one_click_signin_dialog_view.h"
@@ -930,9 +927,7 @@
}
void BrowserView::OnTabRestored(int command_id) {
-#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
reopen_tab_promo_controller_.OnTabReopened(command_id);
-#endif
}
void BrowserView::ZoomChangedForActiveTab(bool can_show_bubble) {
@@ -3053,12 +3048,10 @@
GetWidget()->ShowEmojiPanel();
}
-#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
void BrowserView::ShowInProductHelpPromo(InProductHelpFeature iph_feature) {
if (iph_feature == InProductHelpFeature::kReopenTab)
reopen_tab_promo_controller_.ShowPromo();
}
-#endif
bool BrowserView::DoCutCopyPasteForWebContents(
WebContents* contents,
diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h
index 0d111bd..fcfaa4fa 100644
--- a/chrome/browser/ui/views/frame/browser_view.h
+++ b/chrome/browser/ui/views/frame/browser_view.h
@@ -28,6 +28,7 @@
#include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
#include "chrome/browser/ui/views/exclusive_access_bubble_views_context.h"
#include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views.h"
+#include "chrome/browser/ui/views/feature_promos/reopen_tab_promo_controller.h"
#include "chrome/browser/ui/views/frame/browser_frame.h"
#include "chrome/browser/ui/views/frame/contents_web_view.h"
#include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
@@ -48,10 +49,6 @@
#include "ui/views/widget/widget_observer.h"
#include "ui/views/window/client_view.h"
-#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
-#include "chrome/browser/ui/views/feature_promos/reopen_tab_promo_controller.h"
-#endif // BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
-
// NOTE: For more information about the objects and files in this directory,
// view: http://dev.chromium.org/developers/design-documents/browser-window
@@ -433,9 +430,7 @@
BookmarkBarView* GetBookmarkBarView() const;
LocationBarView* GetLocationBarView() const;
-#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
void ShowInProductHelpPromo(InProductHelpFeature iph_feature) override;
-#endif
// TabStripModelObserver:
void OnTabStripModelChanged(
@@ -842,9 +837,7 @@
std::unique_ptr<FullscreenControlHost> fullscreen_control_host_;
-#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
ReopenTabPromoController reopen_tab_promo_controller_{this};
-#endif
struct ResizeSession {
// The time when user started resizing the window.
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
index 9fab44f..7e5b15b 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
@@ -82,7 +82,7 @@
#include "chrome/browser/browser_process.h"
#endif
-#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
+#if BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP)
#include "chrome/browser/feature_engagement/new_tab/new_tab_tracker.h"
#include "chrome/browser/feature_engagement/new_tab/new_tab_tracker_factory.h"
#endif
@@ -1258,7 +1258,7 @@
if (location_bar_view_ && model()->is_keyword_hint())
location_bar_view_->Layout();
-#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
+#if BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP)
// The user must be starting a session in the same tab as a previous one in
// order to display the new tab in-product help promo. While focusing the
// omnibox is not always a precursor to starting a new session, we don't
diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
index 38a34662..b08af08 100644
--- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
+++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
@@ -54,7 +54,7 @@
#include "ui/views/widget/widget.h"
#include "url/origin.h"
-#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
+#if BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP)
#include "chrome/browser/feature_engagement/new_tab/new_tab_tracker.h"
#include "chrome/browser/feature_engagement/new_tab/new_tab_tracker_factory.h"
#endif
@@ -317,7 +317,6 @@
}
void BrowserTabStripController::CreateNewTab() {
-#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
// This must be called before AddTabAt() so that OmniboxFocused is called
// after NewTabOpened. TODO(collinbaker): remove omnibox focusing from
// triggering conditions (since it is always focused for new tabs) and move
@@ -325,11 +324,10 @@
auto* reopen_tab_iph = ReopenTabInProductHelpFactory::GetForProfile(
browser_view_->browser()->profile());
reopen_tab_iph->NewTabOpened();
-#endif
model_->delegate()->AddTabAt(GURL(), -1, true);
-#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
+#if BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP)
auto* new_tab_tracker =
feature_engagement::NewTabTrackerFactory::GetInstance()->GetForProfile(
browser_view_->browser()->profile());
diff --git a/chrome/browser/ui/views/tabs/new_tab_button.cc b/chrome/browser/ui/views/tabs/new_tab_button.cc
index cf9ea00a..f5021728 100644
--- a/chrome/browser/ui/views/tabs/new_tab_button.cc
+++ b/chrome/browser/ui/views/tabs/new_tab_button.cc
@@ -36,7 +36,7 @@
#include "ui/views/win/hwnd_util.h"
#endif
-#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
+#if BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP)
#include "chrome/browser/feature_engagement/new_tab/new_tab_tracker.h"
#include "chrome/browser/feature_engagement/new_tab/new_tab_tracker_factory.h"
#endif
@@ -207,7 +207,7 @@
}
void NewTabButton::OnWidgetDestroying(views::Widget* widget) {
-#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
+#if BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP)
feature_engagement::NewTabTrackerFactory::GetInstance()
->GetForProfile(tab_strip_->controller()->GetProfile())
->OnPromoClosed();
diff --git a/chrome/browser/ui/views/toolbar/browser_app_menu_button.cc b/chrome/browser/ui/views/toolbar/browser_app_menu_button.cc
index bde927f..3e2387f 100644
--- a/chrome/browser/ui/views/toolbar/browser_app_menu_button.cc
+++ b/chrome/browser/ui/views/toolbar/browser_app_menu_button.cc
@@ -15,6 +15,7 @@
#include "cc/paint/paint_flags.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_otr_state.h"
+#include "chrome/browser/ui/in_product_help/in_product_help.h"
#include "chrome/browser/ui/layout_constants.h"
#include "chrome/browser/ui/toolbar/app_menu_model.h"
#include "chrome/browser/ui/views/chrome_layout_provider.h"
@@ -48,9 +49,6 @@
#include "chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client.h"
#endif // defined(OS_CHROMEOS)
-#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
-#include "chrome/browser/ui/in_product_help/in_product_help.h"
-
namespace {
// Button background and icon colors for in-product help promos. The first is
@@ -141,7 +139,6 @@
};
} // namespace
-#endif
// static
bool BrowserAppMenuButton::g_open_app_immediately_for_testing = false;
@@ -177,7 +174,6 @@
UpdateIcon();
}
-#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
void BrowserAppMenuButton::SetPromoFeature(
base::Optional<InProductHelpFeature> promo_feature) {
if (promo_feature_ == promo_feature)
@@ -212,7 +208,6 @@
UpdateIcon();
SchedulePaint();
}
-#endif
void BrowserAppMenuButton::ShowMenu(int run_types) {
if (IsMenuShowing())
@@ -225,10 +220,10 @@
#endif
Browser* browser = toolbar_view_->browser();
- bool alert_reopen_tab_items = false;
-#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
- alert_reopen_tab_items = promo_feature_ == InProductHelpFeature::kReopenTab;
-#endif
+
+ bool alert_reopen_tab_items =
+ promo_feature_ == InProductHelpFeature::kReopenTab;
+
base::TimeTicks menu_open_time = base::TimeTicks::Now();
RunMenu(
@@ -283,7 +278,6 @@
}
base::Optional<SkColor> BrowserAppMenuButton::GetPromoHighlightColor() const {
-#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
if (promo_feature_) {
return ToolbarButton::AdjustHighlightColorForContrast(
GetThemeProvider(), kFeaturePromoHighlightDarkColor,
@@ -291,7 +285,7 @@
kFeaturePromoHighlightDarkExtremeColor,
kFeaturePromoHighlightLightExtremeColor);
}
-#endif
+
return base::nullopt;
}
@@ -362,7 +356,6 @@
std::unique_ptr<views::InkDropMask> BrowserAppMenuButton::CreateInkDropMask()
const {
-#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
if (promo_feature_) {
// This gets the latest ink drop insets. |SetTrailingMargin()| is called
// whenever our margins change (i.e. due to the window maximizing or
@@ -375,7 +368,6 @@
ink_drop_insets, corner_radius,
kFeaturePromoPulseInsetDip);
}
-#endif
return AppMenuButton::CreateInkDropMask();
}
@@ -387,11 +379,9 @@
}
base::string16 BrowserAppMenuButton::GetTooltipText(const gfx::Point& p) const {
-#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
// Suppress tooltip when IPH is showing.
if (promo_feature_)
return base::string16();
-#endif // BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
return AppMenuButton::GetTooltipText(p);
}
diff --git a/chrome/browser/ui/views/toolbar/browser_app_menu_button.h b/chrome/browser/ui/views/toolbar/browser_app_menu_button.h
index 8361ef7b..9176836e 100644
--- a/chrome/browser/ui/views/toolbar/browser_app_menu_button.h
+++ b/chrome/browser/ui/views/toolbar/browser_app_menu_button.h
@@ -19,9 +19,7 @@
#include "ui/views/view.h"
class ToolbarView;
-#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
enum class InProductHelpFeature;
-#endif
// The app menu button in the main browser window (as opposed to hosted app
// windows, which is implemented in HostedAppMenuButton).
@@ -42,12 +40,10 @@
// with the menu.
void ShowMenu(int run_types);
-#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
// Called to inform the button that it's being used as an anchor for a promo
// for |promo_feature|. When this is non-null, the button is highlighted in a
// noticeable color, and the menu item appearance may be affected.
void SetPromoFeature(base::Optional<InProductHelpFeature> promo_feature);
-#endif
// views::MenuButton:
gfx::Rect GetAnchorBoundsInScreen() const override;
@@ -98,10 +94,8 @@
// Our owning toolbar view.
ToolbarView* const toolbar_view_;
-#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
// The feature, if any, for which this button is anchoring a promo.
base::Optional<InProductHelpFeature> promo_feature_;
-#endif
ScopedObserver<ui::MaterialDesignController,
ui::MaterialDesignControllerObserver>
diff --git a/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc b/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc
index c108af6..71f9cdb 100644
--- a/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc
+++ b/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc
@@ -38,7 +38,7 @@
#include "services/identity/public/cpp/identity_manager.h"
#include "ui/base/text/bytes_formatting.h"
-#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
+#if BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP)
#include "chrome/browser/feature_engagement/incognito_window/incognito_window_tracker.h"
#include "chrome/browser/feature_engagement/incognito_window/incognito_window_tracker_factory.h"
#endif
@@ -278,7 +278,7 @@
content::BrowsingDataFilterBuilder::BLACKLIST),
remover, std::move(callback));
-#if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
+#if BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP)
feature_engagement::IncognitoWindowTrackerFactory::GetInstance()
->GetForProfile(profile_)
->OnBrowsingDataCleared();
