Commit 9f34a7d0 authored by Yuheng Huang's avatar Yuheng Huang Committed by Commit Bot

Send tab_data->favicon_url data url for all profiles

Bug: 1099917
Change-Id: I65aefa50029d343f21beb321df3d95fd39fabd91
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2432768Reviewed-by: default avatarThomas Lukaszewicz <tluk@chromium.org>
Commit-Queue: Yuheng Huang <yuhengh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#811604}
parent 64079bf4
...@@ -185,12 +185,8 @@ tab_search::mojom::TabPtr TabSearchPageHandler::GetTabData( ...@@ -185,12 +185,8 @@ tab_search::mojom::TabPtr TabSearchPageHandler::GetTabData(
if (tab_renderer_data.favicon.isNull()) { if (tab_renderer_data.favicon.isNull()) {
tab_data->is_default_favicon = true; tab_data->is_default_favicon = true;
} else { } else {
// Only send favicon_url for OTR profile where chrome://favicon2 is not tab_data->favicon_url = webui::EncodePNGAndMakeDataURI(
// available. tab_renderer_data.favicon, web_ui_->GetDeviceScaleFactor());
if (browser_->profile()->IsOffTheRecord()) {
tab_data->favicon_url = webui::EncodePNGAndMakeDataURI(
tab_renderer_data.favicon, web_ui_->GetDeviceScaleFactor());
}
tab_data->is_default_favicon = tab_data->is_default_favicon =
tab_renderer_data.favicon.BackedBySameObjectAs( tab_renderer_data.favicon.BackedBySameObjectAs(
favicon::GetDefaultFavicon().AsImageSkia()); favicon::GetDefaultFavicon().AsImageSkia());
......
...@@ -61,7 +61,7 @@ void ExpectNewTab(const tab_search::mojom::Tab* tab, ...@@ -61,7 +61,7 @@ void ExpectNewTab(const tab_search::mojom::Tab* tab,
EXPECT_FALSE(tab->pinned); EXPECT_FALSE(tab->pinned);
EXPECT_EQ(title, tab->title); EXPECT_EQ(title, tab->title);
EXPECT_EQ(url, tab->url); EXPECT_EQ(url, tab->url);
EXPECT_FALSE(tab->favicon_url.has_value()); EXPECT_TRUE(tab->favicon_url.has_value());
EXPECT_TRUE(tab->is_default_favicon); EXPECT_TRUE(tab->is_default_favicon);
EXPECT_TRUE(tab->show_icon); EXPECT_TRUE(tab->show_icon);
EXPECT_GT(tab->last_active_time_ticks, base::TimeTicks()); EXPECT_GT(tab->last_active_time_ticks, base::TimeTicks());
...@@ -367,23 +367,4 @@ TEST_F(TabSearchPageHandlerTest, CloseUITest) { ...@@ -367,23 +367,4 @@ TEST_F(TabSearchPageHandlerTest, CloseUITest) {
handler()->CloseUI(); handler()->CloseUI();
} }
// OTR profile should have a non-empty base64 favicon_url for each tab
TEST_F(TabSearchPageHandlerTest, OTRProfileFaviconTest) {
AddTabWithTitle(browser3(), GURL(kTabUrl1), kTabName1);
BrowserList::SetLastActive(browser3());
ASSERT_TRUE(browser3()->profile()->IsOffTheRecord());
tab_search::mojom::PageHandler::GetProfileTabsCallback callback =
base::BindLambdaForTesting(
[&](tab_search::mojom::ProfileTabsPtr profile_tabs) {
ASSERT_EQ(1u, profile_tabs->windows.size());
auto* window1 = profile_tabs->windows[0].get();
ASSERT_EQ(1u, window1->tabs.size());
ASSERT_TRUE(window1->tabs[0]->favicon_url.has_value());
});
testing::StrictMock<MockPage> page;
auto handler = std::make_unique<TestTabSearchPageHandler>(
page.BindAndGetRemote(), web_ui(), handler_delegate());
handler->GetProfileTabs(std::move(callback));
}
} // namespace } // namespace
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