Skip to content

Commit

Permalink
[responsive toolbar] Standardize toolbar element ids naming
Browse files Browse the repository at this point in the history 
This CL simply changes toolbar element identifiers name; doesn't change
any logic. Today's naming is quite random. To improve readability
follow the format below:

kToolbar[Name][Button/Container]ElementId

Bug: 1474124
Change-Id: I2dc90d526c248900b78acb1b5bbd3b645c3242f9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4795631
Reviewed-by: Brian Sheedy <bsheedy@chromium.org>
Reviewed-by: Thomas Lukaszewicz <tluk@chromium.org>
Reviewed-by: Chris Bookholt <bookholt@chromium.org>
Reviewed-by: Dana Fried <dfried@chromium.org>
Commit-Queue: pengchao Cai <pengchaocai@chromium.org>
Code-Coverage: findit-for-me@appspot.gserviceaccount.com <findit-for-me@appspot.gserviceaccount.com>
Reviewed-by: David Pennington <dpenning@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1187482}
  • Loading branch information
Pengchao Cai authored and Chromium LUCI CQ committed Aug 23, 2023
1 parent c21a2f2 commit 2f813b2
Show file tree
Hide file tree
Showing 48 changed files with 204 additions and 188 deletions.
30 changes: 15 additions & 15 deletions chrome/browser/ui/browser_element_identifiers.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,71 +9,71 @@

// Please keep this list alphabetized.
DEFINE_ELEMENT_IDENTIFIER_VALUE(kAddCurrentTabToReadingListElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kAppMenuButtonElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kAppUninstallDialogOkButtonId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kAutofillCreditCardSuggestionEntryElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kAutofillSuggestionElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kAvatarButtonElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kBatterySaverButtonElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kBackButtonElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kBookmarkBarElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kBookmarkSidePanelWebViewElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kBookmarkStarViewElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kBrowserViewElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kCookieControlsIconElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kDeviceSignalsConsentCancelButtonElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kDeviceSignalsConsentOkButtonElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kDownloadToolbarButtonElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kEnhancedProtectionSettingElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kExclusiveAccessBubbleViewElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kExtensionsMenuButtonElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kExtensionsRequestAccessButtonElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kForwardButtonElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kHighEfficiencyChipElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kInstallPwaElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kIntentChipElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kLocationIconElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kMediaButtonElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kNewTabButtonElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kOfferNotificationChipElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kOmniboxElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kPasswordsOmniboxKeyIconElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kPriceInsightsChipElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kPriceTrackingChipElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kPriceTrackingBookmarkViewElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kPriceTrackingChipElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kReadLaterSidePanelWebViewElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kSavePasswordComboboxElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kSavedTabGroupBarElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kSavedTabGroupButtonElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kSavedTabGroupOverflowButtonElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kSavedTabGroupOverflowMenuId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kSidePanelButtonElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kSidePanelElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kSidePanelCloseButtonElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kSidePanelComboboxElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kSidePanelCompanionToolbarButtonElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kSidePanelElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kSidePanelOpenInNewTabButtonElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kSidePanelPinButtonElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kSidePanelReadingListUnreadElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kSavePasswordComboboxElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kSideSearchButtonElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kSideSearchWebViewElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kTabAlertIndicatorButtonElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kTabCounterButtonElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kTabGroupEditorBubbleId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kTabElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kTabGroupEditorBubbleCloseGroupButtonId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kTabGroupEditorBubbleId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kTabGroupEditorBubbleSaveToggleId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kTabGroupHeaderElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kTabSearchBubbleElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kTabSearchButtonElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kTabElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kTabStripElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kTabStripRegionElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kToolbarAppMenuButtonElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kToolbarAvatarButtonElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kToolbarBackButtonElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kToolbarBatterySaverButtonElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kToolbarDownloadButtonElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kToolbarForwardButtonElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kToolbarMediaButtonElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kToolbarSidePanelButtonElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kToolbarTabCounterButtonElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kTopContainerElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kUserNotesSidePanelWebViewElementId);
DEFINE_ELEMENT_IDENTIFIER_VALUE(kWebUIIPHDemoElementIdentifier);

DEFINE_CUSTOM_ELEMENT_EVENT_TYPE(kBrowserThemeChangedEventId);
DEFINE_CUSTOM_ELEMENT_EVENT_TYPE(kTabGroupedCustomEventId);
DEFINE_CUSTOM_ELEMENT_EVENT_TYPE(kSidePanelComboboxChangedCustomEventId);
DEFINE_CUSTOM_ELEMENT_EVENT_TYPE(kSidePanelReadingMarkedAsReadEventId);
DEFINE_CUSTOM_ELEMENT_EVENT_TYPE(kSideSearchResultsClickedCustomEventId);
DEFINE_CUSTOM_ELEMENT_EVENT_TYPE(kTabGroupedCustomEventId);
30 changes: 15 additions & 15 deletions chrome/browser/ui/browser_element_identifiers.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,73 +18,73 @@
// These should gradually replace values in view_ids.h.
// Please keep this list alphabetized.
DECLARE_ELEMENT_IDENTIFIER_VALUE(kAddCurrentTabToReadingListElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kAppMenuButtonElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kAppUninstallDialogOkButtonId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kAutofillCreditCardSuggestionEntryElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kAutofillSuggestionElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kAvatarButtonElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kBatterySaverButtonElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kBackButtonElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kBookmarkBarElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kBookmarkSidePanelWebViewElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kBookmarkStarViewElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kBrowserViewElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kCookieControlsIconElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kDeviceSignalsConsentCancelButtonElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kDeviceSignalsConsentOkButtonElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kDownloadToolbarButtonElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kEnhancedProtectionSettingElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kExclusiveAccessBubbleViewElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kExtensionsMenuButtonElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kExtensionsRequestAccessButtonElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kForwardButtonElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kHighEfficiencyChipElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kInstallPwaElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kIntentChipElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kLocationIconElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kMediaButtonElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kNewTabButtonElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kOfferNotificationChipElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kOmniboxElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kPasswordsOmniboxKeyIconElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kPriceInsightsChipElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kPriceTrackingChipElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kPriceTrackingBookmarkViewElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kPriceTrackingChipElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kReadLaterSidePanelWebViewElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kSavePasswordComboboxElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kSavedTabGroupBarElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kSavedTabGroupButtonElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kSavedTabGroupOverflowButtonElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kSavedTabGroupOverflowMenuId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kSidePanelButtonElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kSidePanelElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kSidePanelCloseButtonElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kSidePanelComboboxElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kSidePanelCompanionToolbarButtonElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kSidePanelElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kSidePanelOpenInNewTabButtonElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kSidePanelPinButtonElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kSidePanelReadingListUnreadElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kSavePasswordComboboxElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kSideSearchButtonElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kSideSearchWebViewElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kTabAlertIndicatorButtonElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kTabCounterButtonElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kTabGroupEditorBubbleId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kTabElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kTabGroupEditorBubbleCloseGroupButtonId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kTabGroupEditorBubbleId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kTabGroupEditorBubbleSaveToggleId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kTabGroupHeaderElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kTabSearchBubbleElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kTabSearchButtonElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kTabElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kTabStripElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kTabStripRegionElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kToolbarAppMenuButtonElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kToolbarAvatarButtonElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kToolbarBackButtonElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kToolbarBatterySaverButtonElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kToolbarDownloadButtonElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kToolbarForwardButtonElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kToolbarMediaButtonElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kToolbarSidePanelButtonElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kToolbarTabCounterButtonElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kTopContainerElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kUserNotesSidePanelWebViewElementId);
DECLARE_ELEMENT_IDENTIFIER_VALUE(kWebUIIPHDemoElementIdentifier);

DECLARE_CUSTOM_ELEMENT_EVENT_TYPE(kBrowserThemeChangedEventId);
DECLARE_CUSTOM_ELEMENT_EVENT_TYPE(kTabGroupedCustomEventId);
DECLARE_CUSTOM_ELEMENT_EVENT_TYPE(kSidePanelComboboxChangedCustomEventId);
DECLARE_CUSTOM_ELEMENT_EVENT_TYPE(kSidePanelReadingMarkedAsReadEventId);
DECLARE_CUSTOM_ELEMENT_EVENT_TYPE(kSideSearchResultsClickedCustomEventId);
DECLARE_CUSTOM_ELEMENT_EVENT_TYPE(kTabGroupedCustomEventId);

#endif // CHROME_BROWSER_UI_BROWSER_ELEMENT_IDENTIFIERS_H_
3 changes: 2 additions & 1 deletion chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@ void ShowOutdatedUpgradeBubble(Browser* browser, bool auto_update_enabled) {
base::UserMetricsAction("OutdatedUpgradeBubble.Later")))
.Build();

chrome::ShowBubble(browser, kAppMenuButtonElementId, std::move(dialog_model));
chrome::ShowBubble(browser, kToolbarAppMenuButtonElementId,
std::move(dialog_model));

base::RecordAction(
auto_update_enabled
Expand Down
4 changes: 2 additions & 2 deletions chrome/browser/ui/side_search/side_search_tab_contents_helper_interactive_uitest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,11 +239,11 @@ IN_PROC_BROWSER_TEST_F(SideSearchSideContentsHelperBrowsertest,
WaitForWebContentsNavigation(kPrimaryTabElementId, b2_url),

// Go back from page B2. B1 should be skippable and we should return to A.
PressButton(kBackButtonElementId),
PressButton(kToolbarBackButtonElementId),
WaitForWebContentsNavigation(kPrimaryTabElementId, a_url),

// Go back from page A. We should return to the initial page.
PressButton(kBackButtonElementId),
PressButton(kToolbarBackButtonElementId),
WaitForWebContentsNavigation(kPrimaryTabElementId, initial_url));
}

Expand Down
18 changes: 9 additions & 9 deletions chrome/browser/ui/toolbar/app_menu_model_interactive_uitest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class AppMenuModelInteractiveTest : public InteractiveBrowserTest {

IN_PROC_BROWSER_TEST_F(AppMenuModelInteractiveTest, PerformanceNavigation) {
RunTestSequence(InstrumentTab(kPrimaryTabPageElementId),
PressButton(kAppMenuButtonElementId),
PressButton(kToolbarAppMenuButtonElementId),
SelectMenuItem(AppMenuModel::kMoreToolsMenuItem),
SelectMenuItem(ToolsMenuModel::kPerformanceMenuItem),
WaitForWebContentsNavigation(
Expand All @@ -89,7 +89,7 @@ IN_PROC_BROWSER_TEST_F(AppMenuModelInteractiveTest, PerformanceNavigation) {
}

IN_PROC_BROWSER_TEST_F(AppMenuModelInteractiveTest, IncognitoMenuItem) {
RunTestSequence(PressButton(kAppMenuButtonElementId),
RunTestSequence(PressButton(kToolbarAppMenuButtonElementId),
SelectMenuItem(AppMenuModel::kIncognitoMenuItem),
CheckInconitoWindowOpened());
}
Expand All @@ -100,7 +100,7 @@ IN_PROC_BROWSER_TEST_F(AppMenuModelInteractiveTest, IncognitoAccelerator) {
IDC_NEW_INCOGNITO_WINDOW, &incognito_accelerator);

RunTestSequence(
SendAccelerator(kAppMenuButtonElementId, incognito_accelerator),
SendAccelerator(kToolbarAppMenuButtonElementId, incognito_accelerator),
CheckInconitoWindowOpened());
}

Expand Down Expand Up @@ -157,14 +157,14 @@ IN_PROC_BROWSER_TEST_P(ExtensionsMenuModelPresenceTest, MenuPresence) {
if (GetParam()) { // Menu enabled
RunTestSequence(
InstrumentTab(kPrimaryTabPageElementId),
PressButton(kAppMenuButtonElementId),
PressButton(kToolbarAppMenuButtonElementId),
EnsurePresent(AppMenuModel::kExtensionsMenuItem),
SelectMenuItem(AppMenuModel::kExtensionsMenuItem),
EnsurePresent(ExtensionsMenuModel::kManageExtensionsMenuItem),
EnsurePresent(ExtensionsMenuModel::kVisitChromeWebStoreMenuItem));
} else {
RunTestSequence(InstrumentTab(kPrimaryTabPageElementId),
PressButton(kAppMenuButtonElementId),
PressButton(kToolbarAppMenuButtonElementId),
EnsureNotPresent(AppMenuModel::kExtensionsMenuItem));
}

Expand All @@ -181,7 +181,7 @@ IN_PROC_BROWSER_TEST_P(ExtensionsMenuModelPresenceTest, MenuPresence) {
IN_PROC_BROWSER_TEST_F(ExtensionsMenuModelInteractiveTest, ManageExtensions) {
RunTestSequence(
InstrumentTab(kPrimaryTabPageElementId),
PressButton(kAppMenuButtonElementId),
PressButton(kToolbarAppMenuButtonElementId),
SelectMenuItem(AppMenuModel::kExtensionsMenuItem),
SelectMenuItem(ExtensionsMenuModel::kManageExtensionsMenuItem),
WaitForWebContentsNavigation(kPrimaryTabPageElementId,
Expand All @@ -201,7 +201,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionsMenuModelInteractiveTest,
VisitChromeWebStore) {
RunTestSequence(
InstrumentTab(kPrimaryTabPageElementId),
PressButton(kAppMenuButtonElementId),
PressButton(kToolbarAppMenuButtonElementId),
SelectMenuItem(AppMenuModel::kExtensionsMenuItem),
SelectMenuItem(ExtensionsMenuModel::kVisitChromeWebStoreMenuItem),
WaitForWebContentsNavigation(kPrimaryTabPageElementId,
Expand Down Expand Up @@ -238,7 +238,7 @@ IN_PROC_BROWSER_TEST_F(PasswordManagerMenuItemInteractiveTest,
base::HistogramTester histograms;

RunTestSequence(InstrumentTab(kPrimaryTabPageElementId),
PressButton(kAppMenuButtonElementId),
PressButton(kToolbarAppMenuButtonElementId),
SelectMenuItem(AppMenuModel::kPasswordManagerMenuItem),
WaitForWebContentsNavigation(
kPrimaryTabPageElementId,
Expand All @@ -256,6 +256,6 @@ IN_PROC_BROWSER_TEST_F(PasswordManagerMenuItemInteractiveTest,
GURL("chrome://password-manager/passwords")),
WaitForWebContentsReady(kPrimaryTabPageElementId,
GURL("chrome://password-manager/passwords")),
PressButton(kAppMenuButtonElementId),
PressButton(kToolbarAppMenuButtonElementId),
EnsureNotPresent(AppMenuModel::kPasswordManagerMenuItem));
}
2 changes: 1 addition & 1 deletion chrome/browser/ui/views/bookmarks/saved_tab_groups/saved_tab_group_interactive_uitest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class SavedTabGroupInteractiveTest : public InteractiveBrowserTest {
}

MultiStep ShowBookmarksBar() {
return Steps(PressButton(kAppMenuButtonElementId),
return Steps(PressButton(kToolbarAppMenuButtonElementId),
SelectMenuItem(AppMenuModel::kBookmarksMenuItem),
SelectMenuItem(BookmarkSubMenuModel::kShowBookmarkBarMenuItem),
WaitForShow(kBookmarkBarElementId));
Expand Down

0 comments on commit 2f813b2

Please sign in to comment.