components/guest_view/browser/guest_view_manager.cc - Issue 1459973005: Reland of Use std::tie() for operator< in components/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/guest_view/browser/guest_view_manager.cc

Issue 1459973005: Reland of Use std::tie() for operator< in components/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « components/content_settings/core/browser/content_settings_origin_identifier_value_map.cc ('k') | components/mus/ws/ids.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/guest_view/browser/guest_view_manager.cc

diff --git a/components/guest_view/browser/guest_view_manager.cc b/components/guest_view/browser/guest_view_manager.cc

index 4c86e9d17439fad976ee75dc623b66492bfc72bc..c93f95307f3a629dbbcd407038a43c0a205626e8 100644

--- a/components/guest_view/browser/guest_view_manager.cc

+++ b/components/guest_view/browser/guest_view_manager.cc

@@ -3,6 +3,8 @@

// found in the LICENSE file.

#include "components/guest_view/browser/guest_view_manager.h"

+#include <tuple>

#include "base/macros.h"

#include "base/strings/stringprintf.h"

@@ -476,10 +478,8 @@

bool GuestViewManager::ElementInstanceKey::operator<(

const GuestViewManager::ElementInstanceKey& other) const {

- if (embedder_process_id != other.embedder_process_id)

- return embedder_process_id < other.embedder_process_id;

- return element_instance_id < other.element_instance_id;

+ return std::tie(embedder_process_id, element_instance_id) <

+ std::tie(other.embedder_process_id, other.element_instance_id);

}

bool GuestViewManager::ElementInstanceKey::operator==(