diff options
Diffstat (limited to 'chromium/components/physical_web')
| -rw-r--r-- | chromium/components/physical_web/webui/physical_web_base_message_handler.cc | 4 | ||||
| -rw-r--r-- | chromium/components/physical_web/webui/resources/physical_web.html | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/chromium/components/physical_web/webui/physical_web_base_message_handler.cc b/chromium/components/physical_web/webui/physical_web_base_message_handler.cc index dd28dc3dd22..f68cfb08c74 100644 --- a/chromium/components/physical_web/webui/physical_web_base_message_handler.cc +++ b/chromium/components/physical_web/webui/physical_web_base_message_handler.cc @@ -4,6 +4,8 @@ #include "components/physical_web/webui/physical_web_base_message_handler.h" +#include <utility> + #include "base/bind.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h" @@ -88,7 +90,7 @@ void PhysicalWebBaseMessageHandler::PushNearbyURLs() { ++index; } - results.Set(physical_web_ui::kMetadata, metadata.release()); + results.Set(physical_web_ui::kMetadata, std::move(metadata)); // Pass the list of Physical Web URL metadata to the WebUI. A jstemplate will // create a list view with an item for each URL. diff --git a/chromium/components/physical_web/webui/resources/physical_web.html b/chromium/components/physical_web/webui/resources/physical_web.html index 034912ed743..a873271a69d 100644 --- a/chromium/components/physical_web/webui/resources/physical_web.html +++ b/chromium/components/physical_web/webui/resources/physical_web.html @@ -1,8 +1,8 @@ <!doctype html> -<html i18n-values="dir:textdirection;lang:language"> +<html dir="$i18n{textdirection}" lang="$i18n{language}"> <head> <meta charset="utf-8"> -<title i18n-content="title"></title> +<title>$i18n{title}</title> <if expr="is_android or is_ios"> <meta name="viewport" content="width=device-width, user-scalable=no"> </if> @@ -22,9 +22,9 @@ <body> <div id="body-container" hidden> - <h1 i18n-content="title"></h1> + <h1>$i18n{title}</h1> <div id="render-container"></div> - <div id="empty-list-container" i18n-content="emptyMessage"></div> + <div id="empty-list-container">$i18n{emptyMessage}</div> </div> <a hidden id="render-template" class="physicalWebTemplate" jsselect="metadata" |