Commit 18d0908c authored by Dana Fried's avatar Dana Fried Committed by Commit Bot

Add names to all PageActionIconView-derived classes.

With all of the new identity and animation stuff in the toolbar, it's
important to know which button view just barfed all over any given test.

Bug: 1038567
Change-Id: Ia7832558a87cb29bedbfff0e5ece8794f2b8a8c3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1986227Reviewed-by: default avatarPeter Boström <pbos@chromium.org>
Reviewed-by: default avatarDana Fried <dfried@chromium.org>
Commit-Queue: Dana Fried <dfried@chromium.org>
Auto-Submit: Dana Fried <dfried@chromium.org>
Cr-Commit-Position: refs/heads/master@{#728084}
parent 6c787a22
...@@ -140,6 +140,10 @@ const gfx::VectorIcon& LocalCardMigrationIconView::GetVectorIconBadge() const { ...@@ -140,6 +140,10 @@ const gfx::VectorIcon& LocalCardMigrationIconView::GetVectorIconBadge() const {
return gfx::kNoneIcon; return gfx::kNoneIcon;
} }
const char* LocalCardMigrationIconView::GetClassName() const {
return "LocalCardMigrationIconView";
}
base::string16 LocalCardMigrationIconView::GetTextForTooltipAndAccessibleName() base::string16 LocalCardMigrationIconView::GetTextForTooltipAndAccessibleName()
const { const {
return l10n_util::GetStringUTF16(IDS_TOOLTIP_MIGRATE_LOCAL_CARD); return l10n_util::GetStringUTF16(IDS_TOOLTIP_MIGRATE_LOCAL_CARD);
......
...@@ -34,6 +34,7 @@ class LocalCardMigrationIconView : public PageActionIconView { ...@@ -34,6 +34,7 @@ class LocalCardMigrationIconView : public PageActionIconView {
void OnExecuting(PageActionIconView::ExecuteSource execute_source) override; void OnExecuting(PageActionIconView::ExecuteSource execute_source) override;
const gfx::VectorIcon& GetVectorIcon() const override; const gfx::VectorIcon& GetVectorIcon() const override;
const gfx::VectorIcon& GetVectorIconBadge() const override; const gfx::VectorIcon& GetVectorIconBadge() const override;
const char* GetClassName() const override;
private: private:
ManageMigrationUiController* GetController() const; ManageMigrationUiController* GetController() const;
......
...@@ -86,6 +86,10 @@ const gfx::VectorIcon& SaveCardIconView::GetVectorIconBadge() const { ...@@ -86,6 +86,10 @@ const gfx::VectorIcon& SaveCardIconView::GetVectorIconBadge() const {
return gfx::kNoneIcon; return gfx::kNoneIcon;
} }
const char* SaveCardIconView::GetClassName() const {
return "SaveCardIconView";
}
base::string16 SaveCardIconView::GetTextForTooltipAndAccessibleName() const { base::string16 SaveCardIconView::GetTextForTooltipAndAccessibleName() const {
SaveCardBubbleController* controller = GetController(); SaveCardBubbleController* controller = GetController();
if (!controller) { if (!controller) {
......
...@@ -34,6 +34,7 @@ class SaveCardIconView : public PageActionIconView { ...@@ -34,6 +34,7 @@ class SaveCardIconView : public PageActionIconView {
void OnExecuting(PageActionIconView::ExecuteSource execute_source) override; void OnExecuting(PageActionIconView::ExecuteSource execute_source) override;
const gfx::VectorIcon& GetVectorIcon() const override; const gfx::VectorIcon& GetVectorIcon() const override;
const gfx::VectorIcon& GetVectorIconBadge() const override; const gfx::VectorIcon& GetVectorIconBadge() const override;
const char* GetClassName() const override;
private: private:
SaveCardBubbleController* GetController() const; SaveCardBubbleController* GetController() const;
......
...@@ -109,6 +109,10 @@ const gfx::VectorIcon& CookieControlsIconView::GetVectorIcon() const { ...@@ -109,6 +109,10 @@ const gfx::VectorIcon& CookieControlsIconView::GetVectorIcon() const {
return kEyeCrossedIcon; return kEyeCrossedIcon;
} }
const char* CookieControlsIconView::GetClassName() const {
return "CookieControlsIconView";
}
base::string16 CookieControlsIconView::GetTextForTooltipAndAccessibleName() base::string16 CookieControlsIconView::GetTextForTooltipAndAccessibleName()
const { const {
return l10n_util::GetStringUTF16(IDS_COOKIE_CONTROLS_TOOLTIP); return l10n_util::GetStringUTF16(IDS_COOKIE_CONTROLS_TOOLTIP);
......
...@@ -35,6 +35,7 @@ class CookieControlsIconView : public PageActionIconView, ...@@ -35,6 +35,7 @@ class CookieControlsIconView : public PageActionIconView,
protected: protected:
void OnExecuting(PageActionIconView::ExecuteSource source) override; void OnExecuting(PageActionIconView::ExecuteSource source) override;
const gfx::VectorIcon& GetVectorIcon() const override; const gfx::VectorIcon& GetVectorIcon() const override;
const char* GetClassName() const override;
private: private:
bool HasAssociatedBubble() const; bool HasAssociatedBubble() const;
......
...@@ -45,6 +45,10 @@ base::string16 FindBarIcon::GetTextForTooltipAndAccessibleName() const { ...@@ -45,6 +45,10 @@ base::string16 FindBarIcon::GetTextForTooltipAndAccessibleName() const {
return l10n_util::GetStringUTF16(IDS_TOOLTIP_FIND); return l10n_util::GetStringUTF16(IDS_TOOLTIP_FIND);
} }
const char* FindBarIcon::GetClassName() const {
return "FindBarIcon";
}
void FindBarIcon::OnExecuting(ExecuteSource execute_source) {} void FindBarIcon::OnExecuting(ExecuteSource execute_source) {}
views::BubbleDialogDelegateView* FindBarIcon::GetBubble() const { views::BubbleDialogDelegateView* FindBarIcon::GetBubble() const {
......
...@@ -27,6 +27,7 @@ class FindBarIcon : public PageActionIconView { ...@@ -27,6 +27,7 @@ class FindBarIcon : public PageActionIconView {
views::BubbleDialogDelegateView* GetBubble() const override; views::BubbleDialogDelegateView* GetBubble() const override;
const gfx::VectorIcon& GetVectorIcon() const override; const gfx::VectorIcon& GetVectorIcon() const override;
base::string16 GetTextForTooltipAndAccessibleName() const override; base::string16 GetTextForTooltipAndAccessibleName() const override;
const char* GetClassName() const override;
private: private:
DISALLOW_COPY_AND_ASSIGN(FindBarIcon); DISALLOW_COPY_AND_ASSIGN(FindBarIcon);
......
...@@ -107,3 +107,7 @@ const gfx::VectorIcon& IntentPickerView::GetVectorIcon() const { ...@@ -107,3 +107,7 @@ const gfx::VectorIcon& IntentPickerView::GetVectorIcon() const {
base::string16 IntentPickerView::GetTextForTooltipAndAccessibleName() const { base::string16 IntentPickerView::GetTextForTooltipAndAccessibleName() const {
return l10n_util::GetStringUTF16(IDS_TOOLTIP_INTENT_PICKER_ICON); return l10n_util::GetStringUTF16(IDS_TOOLTIP_INTENT_PICKER_ICON);
} }
const char* IntentPickerView::GetClassName() const {
return "IntentPickerView";
}
...@@ -26,6 +26,7 @@ class IntentPickerView : public PageActionIconView { ...@@ -26,6 +26,7 @@ class IntentPickerView : public PageActionIconView {
views::BubbleDialogDelegateView* GetBubble() const override; views::BubbleDialogDelegateView* GetBubble() const override;
const gfx::VectorIcon& GetVectorIcon() const override; const gfx::VectorIcon& GetVectorIcon() const override;
base::string16 GetTextForTooltipAndAccessibleName() const override; base::string16 GetTextForTooltipAndAccessibleName() const override;
const char* GetClassName() const override;
private: private:
bool IsIncognitoMode() const; bool IsIncognitoMode() const;
......
...@@ -128,6 +128,10 @@ base::string16 StarView::GetTextForTooltipAndAccessibleName() const { ...@@ -128,6 +128,10 @@ base::string16 StarView::GetTextForTooltipAndAccessibleName() const {
: IDS_TOOLTIP_STAR); : IDS_TOOLTIP_STAR);
} }
const char* StarView::GetClassName() const {
return "StarView";
}
SkColor StarView::GetInkDropBaseColor() const { SkColor StarView::GetInkDropBaseColor() const {
return bookmark_promo_observer_.IsObservingSources() return bookmark_promo_observer_.IsObservingSources()
? GetNativeTheme()->GetSystemColor( ? GetNativeTheme()->GetSystemColor(
......
...@@ -40,6 +40,7 @@ class StarView : public PageActionIconView, ...@@ -40,6 +40,7 @@ class StarView : public PageActionIconView,
SkColor GetInkDropBaseColor() const override; SkColor GetInkDropBaseColor() const override;
const gfx::VectorIcon& GetVectorIcon() const override; const gfx::VectorIcon& GetVectorIcon() const override;
base::string16 GetTextForTooltipAndAccessibleName() const override; base::string16 GetTextForTooltipAndAccessibleName() const override;
const char* GetClassName() const override;
// views::WidgetObserver: // views::WidgetObserver:
void OnWidgetDestroying(views::Widget* widget) override; void OnWidgetDestroying(views::Widget* widget) override;
......
...@@ -105,3 +105,7 @@ const gfx::VectorIcon& NativeFileSystemAccessIconView::GetVectorIcon() const { ...@@ -105,3 +105,7 @@ const gfx::VectorIcon& NativeFileSystemAccessIconView::GetVectorIcon() const {
return has_write_access_ ? kSaveOriginalFileIcon return has_write_access_ ? kSaveOriginalFileIcon
: vector_icons::kInsertDriveFileOutlineIcon; : vector_icons::kInsertDriveFileOutlineIcon;
} }
const char* NativeFileSystemAccessIconView::GetClassName() const {
return "NativeFileSystemAccessIconView";
}
...@@ -22,6 +22,7 @@ class NativeFileSystemAccessIconView : public PageActionIconView { ...@@ -22,6 +22,7 @@ class NativeFileSystemAccessIconView : public PageActionIconView {
base::string16 GetTextForTooltipAndAccessibleName() const override; base::string16 GetTextForTooltipAndAccessibleName() const override;
void OnExecuting(ExecuteSource execute_source) override; void OnExecuting(ExecuteSource execute_source) override;
const gfx::VectorIcon& GetVectorIcon() const override; const gfx::VectorIcon& GetVectorIcon() const override;
const char* GetClassName() const override;
private: private:
bool has_write_access_ = false; bool has_write_access_ = false;
......
...@@ -192,6 +192,10 @@ void PageActionIconView::OnTouchUiChanged() { ...@@ -192,6 +192,10 @@ void PageActionIconView::OnTouchUiChanged() {
PreferredSizeChanged(); PreferredSizeChanged();
} }
const char* PageActionIconView::GetClassName() const {
return "PageActionIconView";
}
void PageActionIconView::SetIconColor(SkColor icon_color) { void PageActionIconView::SetIconColor(SkColor icon_color) {
icon_color_ = icon_color; icon_color_ = icon_color;
UpdateIconImage(); UpdateIconImage();
......
...@@ -137,6 +137,7 @@ class PageActionIconView : public IconLabelBubbleView { ...@@ -137,6 +137,7 @@ class PageActionIconView : public IconLabelBubbleView {
// IconLabelBubbleView: // IconLabelBubbleView:
void OnBoundsChanged(const gfx::Rect& previous_bounds) override; void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
void OnTouchUiChanged() override; void OnTouchUiChanged() override;
const char* GetClassName() const override;
// Updates the icon image after some state has changed. // Updates the icon image after some state has changed.
virtual void UpdateIconImage(); virtual void UpdateIconImage();
......
...@@ -75,3 +75,7 @@ base::string16 PwaInstallView::GetTextForTooltipAndAccessibleName() const { ...@@ -75,3 +75,7 @@ base::string16 PwaInstallView::GetTextForTooltipAndAccessibleName() const {
IDS_OMNIBOX_PWA_INSTALL_ICON_TOOLTIP, IDS_OMNIBOX_PWA_INSTALL_ICON_TOOLTIP,
banners::AppBannerManager::GetInstallableWebAppName(web_contents)); banners::AppBannerManager::GetInstallableWebAppName(web_contents));
} }
const char* PwaInstallView::GetClassName() const {
return "PwaInstallView";
}
...@@ -25,6 +25,7 @@ class PwaInstallView : public PageActionIconView { ...@@ -25,6 +25,7 @@ class PwaInstallView : public PageActionIconView {
views::BubbleDialogDelegateView* GetBubble() const override; views::BubbleDialogDelegateView* GetBubble() const override;
const gfx::VectorIcon& GetVectorIcon() const override; const gfx::VectorIcon& GetVectorIcon() const override;
base::string16 GetTextForTooltipAndAccessibleName() const override; base::string16 GetTextForTooltipAndAccessibleName() const override;
const char* GetClassName() const override;
private: private:
DISALLOW_COPY_AND_ASSIGN(PwaInstallView); DISALLOW_COPY_AND_ASSIGN(PwaInstallView);
......
...@@ -112,3 +112,7 @@ base::string16 ZoomView::GetTextForTooltipAndAccessibleName() const { ...@@ -112,3 +112,7 @@ base::string16 ZoomView::GetTextForTooltipAndAccessibleName() const {
return l10n_util::GetStringFUTF16(IDS_TOOLTIP_ZOOM, return l10n_util::GetStringFUTF16(IDS_TOOLTIP_ZOOM,
base::FormatPercent(current_zoom_percent_)); base::FormatPercent(current_zoom_percent_));
} }
const char* ZoomView::GetClassName() const {
return "ZoomView";
}
...@@ -30,6 +30,7 @@ class ZoomView : public PageActionIconView { ...@@ -30,6 +30,7 @@ class ZoomView : public PageActionIconView {
views::BubbleDialogDelegateView* GetBubble() const override; views::BubbleDialogDelegateView* GetBubble() const override;
const gfx::VectorIcon& GetVectorIcon() const override; const gfx::VectorIcon& GetVectorIcon() const override;
base::string16 GetTextForTooltipAndAccessibleName() const override; base::string16 GetTextForTooltipAndAccessibleName() const override;
const char* GetClassName() const override;
private: private:
bool ShouldBeVisible(bool can_show_bubble) const; bool ShouldBeVisible(bool can_show_bubble) const;
......
...@@ -67,6 +67,10 @@ const gfx::VectorIcon& QRCodeGeneratorIconView::GetVectorIcon() const { ...@@ -67,6 +67,10 @@ const gfx::VectorIcon& QRCodeGeneratorIconView::GetVectorIcon() const {
return kQrcodeGeneratorIcon; return kQrcodeGeneratorIcon;
} }
const char* QRCodeGeneratorIconView::GetClassName() const {
return "QRCodeGeneratorIconView";
}
SkColor QRCodeGeneratorIconView::GetForegroundColor() const { SkColor QRCodeGeneratorIconView::GetForegroundColor() const {
return GetOmniboxColor(GetThemeProvider(), return GetOmniboxColor(GetThemeProvider(),
OmniboxPart::LOCATION_BAR_TEXT_DEFAULT); OmniboxPart::LOCATION_BAR_TEXT_DEFAULT);
......
...@@ -32,6 +32,7 @@ class QRCodeGeneratorIconView : public PageActionIconView { ...@@ -32,6 +32,7 @@ class QRCodeGeneratorIconView : public PageActionIconView {
// PageActionIconView: // PageActionIconView:
void OnExecuting(PageActionIconView::ExecuteSource execute_source) override; void OnExecuting(PageActionIconView::ExecuteSource execute_source) override;
const gfx::VectorIcon& GetVectorIcon() const override; const gfx::VectorIcon& GetVectorIcon() const override;
const char* GetClassName() const override;
private: private:
DISALLOW_COPY_AND_ASSIGN(QRCodeGeneratorIconView); DISALLOW_COPY_AND_ASSIGN(QRCodeGeneratorIconView);
......
...@@ -60,6 +60,10 @@ base::string16 ReaderModeIconView::GetTextForTooltipAndAccessibleName() const { ...@@ -60,6 +60,10 @@ base::string16 ReaderModeIconView::GetTextForTooltipAndAccessibleName() const {
return l10n_util::GetStringUTF16(IDS_DISTILL_PAGE); return l10n_util::GetStringUTF16(IDS_DISTILL_PAGE);
} }
const char* ReaderModeIconView::GetClassName() const {
return "ReaderModeIconView";
}
// TODO(gilmanmh): Consider displaying a bubble the first time a user // TODO(gilmanmh): Consider displaying a bubble the first time a user
// activates the icon to explain what Reader Mode is. // activates the icon to explain what Reader Mode is.
views::BubbleDialogDelegateView* ReaderModeIconView::GetBubble() const { views::BubbleDialogDelegateView* ReaderModeIconView::GetBubble() const {
......
...@@ -39,6 +39,7 @@ class ReaderModeIconView : public PageActionIconView, ...@@ -39,6 +39,7 @@ class ReaderModeIconView : public PageActionIconView,
void UpdateImpl() override; void UpdateImpl() override;
const gfx::VectorIcon& GetVectorIcon() const override; const gfx::VectorIcon& GetVectorIcon() const override;
base::string16 GetTextForTooltipAndAccessibleName() const override; base::string16 GetTextForTooltipAndAccessibleName() const override;
const char* GetClassName() const override;
// GetBubble() is required by PageActionIconView; however, the icon // GetBubble() is required by PageActionIconView; however, the icon
// intentionally does not display a bubble when activated. // intentionally does not display a bubble when activated.
......
...@@ -85,6 +85,10 @@ const gfx::VectorIcon& SendTabToSelfIconView::GetVectorIcon() const { ...@@ -85,6 +85,10 @@ const gfx::VectorIcon& SendTabToSelfIconView::GetVectorIcon() const {
return kSendTabToSelfIcon; return kSendTabToSelfIcon;
} }
const char* SendTabToSelfIconView::GetClassName() const {
return "SendTabToSelfIconView";
}
SkColor SendTabToSelfIconView::GetForegroundColor() const { SkColor SendTabToSelfIconView::GetForegroundColor() const {
return GetOmniboxColor(GetThemeProvider(), return GetOmniboxColor(GetThemeProvider(),
OmniboxPart::LOCATION_BAR_TEXT_DEFAULT); OmniboxPart::LOCATION_BAR_TEXT_DEFAULT);
......
...@@ -37,6 +37,7 @@ class SendTabToSelfIconView : public PageActionIconView { ...@@ -37,6 +37,7 @@ class SendTabToSelfIconView : public PageActionIconView {
// PageActionIconView: // PageActionIconView:
void OnExecuting(PageActionIconView::ExecuteSource execute_source) override; void OnExecuting(PageActionIconView::ExecuteSource execute_source) override;
const gfx::VectorIcon& GetVectorIcon() const override; const gfx::VectorIcon& GetVectorIcon() const override;
const char* GetClassName() const override;
private: private:
enum class AnimationState { kNotShown, kShowing, kShown }; enum class AnimationState { kNotShown, kShowing, kShown };
......
...@@ -169,3 +169,7 @@ base::string16 SharingIconView::GetTextForTooltipAndAccessibleName() const { ...@@ -169,3 +169,7 @@ base::string16 SharingIconView::GetTextForTooltipAndAccessibleName() const {
return controller ? controller->GetTextForTooltipAndAccessibleName() return controller ? controller->GetTextForTooltipAndAccessibleName()
: base::string16(); : base::string16();
} }
const char* SharingIconView::GetClassName() const {
return "SharingIconView";
}
...@@ -37,6 +37,7 @@ class SharingIconView : public PageActionIconView { ...@@ -37,6 +37,7 @@ class SharingIconView : public PageActionIconView {
void UpdateImpl() override; void UpdateImpl() override;
const gfx::VectorIcon& GetVectorIcon() const override; const gfx::VectorIcon& GetVectorIcon() const override;
base::string16 GetTextForTooltipAndAccessibleName() const override; base::string16 GetTextForTooltipAndAccessibleName() const override;
const char* GetClassName() const override;
// gfx::AnimationDelegate: // gfx::AnimationDelegate:
void AnimationProgressed(const gfx::Animation* animation) override; void AnimationProgressed(const gfx::Animation* animation) override;
......
...@@ -67,3 +67,7 @@ const gfx::VectorIcon& TranslateIconView::GetVectorIcon() const { ...@@ -67,3 +67,7 @@ const gfx::VectorIcon& TranslateIconView::GetVectorIcon() const {
base::string16 TranslateIconView::GetTextForTooltipAndAccessibleName() const { base::string16 TranslateIconView::GetTextForTooltipAndAccessibleName() const {
return l10n_util::GetStringUTF16(IDS_TOOLTIP_TRANSLATE); return l10n_util::GetStringUTF16(IDS_TOOLTIP_TRANSLATE);
} }
const char* TranslateIconView::GetClassName() const {
return "TranslateIconView";
}
...@@ -29,6 +29,7 @@ class TranslateIconView : public PageActionIconView { ...@@ -29,6 +29,7 @@ class TranslateIconView : public PageActionIconView {
void OnPressed(bool activated) override; void OnPressed(bool activated) override;
const gfx::VectorIcon& GetVectorIcon() const override; const gfx::VectorIcon& GetVectorIcon() const override;
base::string16 GetTextForTooltipAndAccessibleName() const override; base::string16 GetTextForTooltipAndAccessibleName() const override;
const char* GetClassName() const override;
private: private:
DISALLOW_COPY_AND_ASSIGN(TranslateIconView); DISALLOW_COPY_AND_ASSIGN(TranslateIconView);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment