github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Convert FrameHostMsg_UpdateFaviconURL to mojo

Browse Source 
https://chromium-review.googlesource.com/c/chromium/src/+/2043181
This commit is contained in:
deepak1556
2020-02-29 23:44:31 -08:00
parent 32fffd1248
commit 11b9c27eee
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
shell/browser/api/electron_api_web_contents.cc
View File

@@ -1236,12 +1236,12 @@ void WebContents::TitleWasSet(content::NavigationEntry* entry) {
}
void WebContents::DidUpdateFaviconURL(
const std::vector<content::FaviconURL>& urls) {
const std::vector<blink::mojom::FaviconURLPtr>& urls) {
std::set<GURL> unique_urls;
for (const auto& iter : urls) {
if (iter.icon_type != content::FaviconURL::IconType::kFavicon)
if (iter->icon_type != blink::mojom::FaviconIconType::kFavicon)
continue;
const GURL& url = iter.icon_url;
const GURL& url = iter->icon_url;
if (url.is_valid())
unique_urls.insert(url);
}

4
shell/browser/api/electron_api_web_contents.h
View File

@@ -18,7 +18,6 @@
#include "content/public/browser/render_widget_host.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_observer.h"
#include "content/public/common/favicon_url.h"
#include "electron/buildflags/buildflags.h"
#include "electron/shell/common/api/api.mojom.h"
#include "gin/handle.h"
@@ -29,6 +28,7 @@
#include "shell/browser/api/save_page_handler.h"
#include "shell/browser/common_web_contents_delegate.h"
#include "shell/common/gin_helper/trackable_object.h"
#include "third_party/blink/public/mojom/favicon/favicon_url.mojom.h"
#include "ui/gfx/image/image.h"
#if BUILDFLAG(ENABLE_PRINTING)
@@ -476,7 +476,7 @@ class WebContents : public gin_helper::TrackableObject<WebContents>,
const content::LoadCommittedDetails& load_details) override;
void TitleWasSet(content::NavigationEntry* entry) override;
void DidUpdateFaviconURL(
const std::vector<content::FaviconURL>& urls) override;
const std::vector<blink::mojom::FaviconURLPtr>& urls) override;
void PluginCrashed(const base::FilePath& plugin_path,
base::ProcessId plugin_pid) override;
void MediaStartedPlaying(const MediaPlayerInfo& video_type,