Commit 8ba8b853 authored by Roman Arora's avatar Roman Arora Committed by Commit Bot

Tab Search: Add localized string, return full tab urls.

Bug: 1099917
Change-Id: Ide10c0b59f3e677fb2b9afc63ec6882ff778d8c2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2292818
Commit-Queue: Roman Arora <romanarora@chromium.org>
Reviewed-by: default avatarRobert Liao <robliao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#788419}
parent 7993f783
......@@ -98,7 +98,7 @@ tab_search::mojom::TabPtr TabSearchPageHandler::GetTabData(
TabRendererData::FromTabInModel(browser->tab_strip_model(), index);
tab_data->pinned = tab_renderer_data.pinned;
tab_data->title = base::UTF16ToUTF8(tab_renderer_data.title);
tab_data->url = tab_renderer_data.visible_url.GetContent();
tab_data->url = tab_renderer_data.visible_url.spec();
if (tab_renderer_data.favicon.isNull()) {
tab_data->is_default_favicon = true;
......
......@@ -20,10 +20,6 @@ constexpr char kTabUrl2[] = "http://foo/2";
constexpr char kTabUrl3[] = "http://foo/3";
constexpr char kTabUrl4[] = "http://foo/4";
constexpr char kTabUrlName1[] = "foo/1";
constexpr char kTabUrlName2[] = "foo/2";
constexpr char kTabUrlName3[] = "foo/3";
constexpr char kTabName1[] = "Tab 1";
constexpr char kTabName2[] = "Tab 2";
constexpr char kTabName3[] = "Tab 3";
......@@ -153,11 +149,11 @@ TEST_F(TabSearchPageHandlerTest, GetTabs) {
ASSERT_EQ(2u, window1->tabs.size());
auto* tab1 = window1->tabs[0].get();
ExpectNewTab(tab1, kTabUrlName1, kTabName1, 0);
ExpectNewTab(tab1, kTabUrl1, kTabName1, 0);
ASSERT_TRUE(tab1->active);
auto* tab2 = window1->tabs[1].get();
ExpectNewTab(tab2, kTabUrlName2, kTabName2, 1);
ExpectNewTab(tab2, kTabUrl2, kTabName2, 1);
ASSERT_FALSE(tab2->active);
auto* window2 = profile_tabs->windows[1].get();
......@@ -165,7 +161,7 @@ TEST_F(TabSearchPageHandlerTest, GetTabs) {
ASSERT_EQ(1u, window2->tabs.size());
auto* tab3 = window2->tabs[0].get();
ExpectNewTab(tab3, kTabUrlName3, kTabName3, 0);
ExpectNewTab(tab3, kTabUrl3, kTabName3, 0);
ASSERT_TRUE(tab3->active);
tab_id2 = tab2->tab_id;
......
......@@ -8,6 +8,8 @@
#include "chrome/browser/ui/webui/tab_search/tab_search_page_handler.h"
#include "chrome/browser/ui/webui/webui_util.h"
#include "chrome/common/webui_url_constants.h"
#include "chrome/grit/generated_resources.h"
#include "components/strings/grit/components_strings.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_ui.h"
#include "content/public/browser/web_ui_data_source.h"
......@@ -29,6 +31,7 @@ TabSearchUI::TabSearchUI(content::WebUI* web_ui)
#if BUILDFLAG(ENABLE_TAB_SEARCH)
content::WebUIDataSource* source =
content::WebUIDataSource::Create(chrome::kChromeUITabSearchHost);
source->AddLocalizedString("close", IDS_CLOSE);
source->AddResourcePath("tab_search.mojom-lite.js",
IDR_TAB_SEARCH_MOJO_LITE_JS);
webui::SetupWebUIDataSource(
......
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