Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1494)

Unified Diff: chrome/browser/media/webrtc/window_icon_util_ozone.cc

Issue 2408803002: Make it possible to launch chrome --mash with ozone_platform={wayland|x11}, chromeos=0 (Closed)
Patch Set: Make it possible to launch chrome --mash with ozone_platform={wayland|x11}, chromeos=0 Created 4 years, 2 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:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/media/webrtc/window_icon_util_ozone.cc
diff --git a/chrome/browser/media/webrtc/window_icon_util_chromeos.cc b/chrome/browser/media/webrtc/window_icon_util_ozone.cc
similarity index 62%
copy from chrome/browser/media/webrtc/window_icon_util_chromeos.cc
copy to chrome/browser/media/webrtc/window_icon_util_ozone.cc
index 9c9130fafce47d08f45e7891f2b18b71084da2cb..f21d5ba888f3f45cd503cbef0eebb2e4fa23b4a1 100644
--- a/chrome/browser/media/webrtc/window_icon_util_chromeos.cc
+++ b/chrome/browser/media/webrtc/window_icon_util_ozone.cc
@@ -10,12 +10,9 @@
gfx::ImageSkia GetWindowIcon(content::DesktopMediaID id) {
DCHECK_EQ(content::DesktopMediaID::TYPE_WINDOW, id.type);
- aura::Window* window = content::DesktopMediaID::GetAuraWindowById(id);
- if (!window)
- return gfx::ImageSkia();
-
- const gfx::ImageSkia* icon_image_ptr =
- window->GetProperty(aura::client::kWindowIconKey);
-
- return icon_image_ptr ? *icon_image_ptr : gfx::ImageSkia();
+ // TODO(tonikitoo): can we make the implementation of
+ // chrome/browser/media/webrtc/window_icon_util_chromeos.cc generic
+ // enough so we can reuse it here?
+ NOTIMPLEMENTED();
+ return gfx::ImageSkia();
}

Powered by Google App Engine
This is Rietveld 408576698