Commit 81e4e2cf authored by Peter Kasting's avatar Peter Kasting Committed by Commit Bot

Fix bad merge.

https://chromium-review.googlesource.com/c/chromium/src/+/1980478/3..4/chrome/browser/ui/views/web_apps/web_app_frame_toolbar_view.cc#b479
unintentionally removed a line.  That line will eventually be removed later, but
for now removing it is a regression.  Undo the removal.

Bug: 1033922
Tbr: estade
Change-Id: If1f37f3549d8870191051b6b2e661afedc0ea044
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1984747Reviewed-by: default avatarPeter Kasting <pkasting@chromium.org>
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#727835}
parent c30a0dde
...@@ -477,6 +477,9 @@ class WebAppFrameToolbarView::ToolbarButtonContainer ...@@ -477,6 +477,9 @@ class WebAppFrameToolbarView::ToolbarButtonContainer
return GetNativeTheme()->GetSystemColor( return GetNativeTheme()->GetSystemColor(
ui::NativeTheme::kColorId_TextfieldDefaultColor); ui::NativeTheme::kColorId_TextfieldDefaultColor);
} }
SkColor GetIconLabelBubbleInkDropColor() const override {
return icon_color_;
}
// ContentSettingImageView::Delegate: // ContentSettingImageView::Delegate:
content::WebContents* GetContentSettingWebContents() override { content::WebContents* GetContentSettingWebContents() override {
......
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