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

Side by Side 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 unified diff | Download patch
OLDNEW
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 // TODO(tonikitoo): can we make the implementation of
14 if (!window) 14 // chrome/browser/media/webrtc/window_icon_util_chromeos.cc generic
15 return gfx::ImageSkia(); 15 // enough so we can reuse it here?
16 16 NOTIMPLEMENTED();
17 const gfx::ImageSkia* icon_image_ptr = 17 return gfx::ImageSkia();
18 window->GetProperty(aura::client::kWindowIconKey);
19
20 return icon_image_ptr ? *icon_image_ptr : gfx::ImageSkia();
21 } 18 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698