chrome/browser/media/webrtc/window_icon_util_x11.cc - Issue 2914103002: Remove usages of XInternAtom

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: chrome/browser/media/webrtc/window_icon_util_x11.cc

Issue 2914103002: Remove usages of XInternAtom (Closed)

Patch Set: Address sadrul and sergeyu comments Created 3 years, 7 months ago

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

Jump to:

Index: chrome/browser/media/webrtc/window_icon_util_x11.cc

diff --git a/chrome/browser/media/webrtc/window_icon_util_x11.cc b/chrome/browser/media/webrtc/window_icon_util_x11.cc

index a69c365d7b770873d5e13a85778e2b7f180ce2a9..e9b34ae5ad7225b5941841858257ba21fdcd069d 100644

--- a/chrome/browser/media/webrtc/window_icon_util_x11.cc

+++ b/chrome/browser/media/webrtc/window_icon_util_x11.cc

@@ -7,6 +7,7 @@

#include <X11/Xatom.h>

#include <X11/Xutil.h>

+#include "ui/base/x/x11_util.h"

#include "ui/gfx/x/x11_error_tracker.h"

#include "ui/gfx/x/x11_types.h"

@@ -14,7 +15,7 @@ gfx::ImageSkia GetWindowIcon(content::DesktopMediaID id) {

DCHECK(id.type == content::DesktopMediaID::TYPE_WINDOW);

Display* display = gfx::GetXDisplay();

- Atom property = XInternAtom(display, "_NET_WM_ICON", True);

+ Atom property = ui::GetAtom("_NET_WM_ICON");

Atom actual_type;

int actual_format;

unsigned long bytes_after; // NOLINT: type required by XGetWindowProperty

« no previous file with comments | « ash/host/ash_window_tree_host_x11.cc ('k') | ui/aura/test/ui_controls_factory_aurax11.cc » ('j') | no next file with comments »