| 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/window_icon_util.h" | 5 #include "chrome/browser/media/webrtc/window_icon_util.h" |
| 6 | 6 |
| 7 #include <X11/Xatom.h> | 7 #include <X11/Xatom.h> |
| 8 #include <X11/Xutil.h> | 8 #include <X11/Xutil.h> |
| 9 | 9 |
| 10 #include "ui/gfx/x/x11_error_tracker.h" | 10 #include "ui/gfx/x/x11_error_tracker.h" |
| 11 #include "ui/gfx/x/x11_types.h" | 11 #include "ui/gfx/x/x11_types.h" |
| 12 | 12 |
| 13 gfx::ImageSkia GetWindowIcon(content::DesktopMediaID id) { | 13 gfx::ImageSkia GetWindowIcon(content::DesktopMediaID id) { |
| 14 DCHECK(id.type == content::DesktopMediaID::TYPE_WINDOW); | 14 DCHECK(id.type == content::DesktopMediaID::TYPE_WINDOW); |
| 15 | 15 |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 for (long y = 0; y < height; ++y) { | 66 for (long y = 0; y < height; ++y) { |
| 67 for (long x = 0; x < width; ++x) { | 67 for (long x = 0; x < width; ++x) { |
| 68 pixels_data[result.rowBytesAsPixels() * y + x] = | 68 pixels_data[result.rowBytesAsPixels() * y + x] = |
| 69 static_cast<uint32_t>(data[start + width * y + x]); | 69 static_cast<uint32_t>(data[start + width * y + x]); |
| 70 } | 70 } |
| 71 } | 71 } |
| 72 | 72 |
| 73 XFree(data); | 73 XFree(data); |
| 74 return gfx::ImageSkia::CreateFrom1xBitmap(result); | 74 return gfx::ImageSkia::CreateFrom1xBitmap(result); |
| 75 } | 75 } |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2307083002:
Cleanup: move WebRTC related files from chrome/browser/media to chrome/browser/media/webrtc/ (Closed)
