chrome/browser/media/window_icon_util_chromeos.cc - Issue 2307083002: Cleanup: move WebRTC related files from chrome/browser/media to chrome/browser/media/webrtc/

Side by Side Diff

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

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

Side by Side Diff: chrome/browser/media/window_icon_util_chromeos.cc

Issue 2307083002: Cleanup: move WebRTC related files from chrome/browser/media to chrome/browser/media/webrtc/ (Closed)

Patch Set: Removed file wrongly resuscitated during rebase Created 4 years, 3 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:

OLD	NEW
	(Empty)
1 // Copyright 2016 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.

4

5 #include "chrome/browser/media/window_icon_util.h"

6

7 #include "content/public/browser/desktop_media_id.h"

8 #include "ui/aura/client/aura_constants.h"

9 #include "ui/aura/window.h"

10

11 gfx::ImageSkia GetWindowIcon(content::DesktopMediaID id) {

12 DCHECK_EQ(content::DesktopMediaID::TYPE_WINDOW, id.type);

13 aura::Window* window = content::DesktopMediaID::GetAuraWindowById(id);

14 if (!window)

15 return gfx::ImageSkia();

16

17 const gfx::ImageSkia* icon_image_ptr =

18 window->GetProperty(aura::client::kWindowIconKey);

19

20 return icon_image_ptr ? *icon_image_ptr : gfx::ImageSkia();

21 }

OLD	NEW