chrome/browser/media/webrtc/window_icon_util_chromeos.cc - Issue 2462753002: Use Ash's ShelfWindowWatcher for app panel windows.

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/webrtc/window_icon_util_chromeos.cc

Issue 2462753002: Use Ash's ShelfWindowWatcher for app panel windows. (Closed)

Patch Set: Add ShelfWindowWatcherTest, remove ChromeLauncherControllerImplTest panel use. Created 4 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 unified diff | Download patch

« ash/common/wm_window_property.h ('K') | « ash/shell/window_watcher_shelf_item_delegate.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc » ('j') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	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	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

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

6	6

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

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

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

10	10

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

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

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

14 if (!window)	14 if (!window)

15 return gfx::ImageSkia();	15 return gfx::ImageSkia();

16	16

17 const gfx::ImageSkia* icon_image_ptr =	17 gfx::ImageSkia* image = window->GetProperty(aura::client::kWindowIconKey);

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

19	19 image = window->GetProperty(aura::client::kAppIconKey);

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

21 }	21 }

OLD	NEW