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

Unified Diff: chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc

Issue 1960293003: Remove OS_CHROMEOS from ui/ash code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 7 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
« no previous file with comments | « no previous file | chrome/browser/ui/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc
diff --git a/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc b/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc
index 8a2e4decf663387ce49e2a7a2dda2584e5fc468e..b2d67d8267f4e5560a6623b44b187ece34bdacac 100644
--- a/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc
+++ b/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc
@@ -17,7 +17,6 @@
#include "chrome/browser/media/media_capture_devices_dispatcher.h"
#include "chrome/browser/media/native_desktop_media_list.h"
#include "chrome/browser/media/tab_desktop_media_list.h"
-#include "chrome/browser/ui/ash/ash_util.h"
#include "chrome/common/channel_info.h"
#include "components/version_info/version_info.h"
#include "content/public/browser/render_frame_host.h"
@@ -146,10 +145,8 @@ bool DesktopCaptureChooseDesktopMediaFunctionBase::Execute(
// Create a screens list.
if (show_screens) {
#if defined(USE_ASH)
- if (chrome::IsNativeWindowInAsh(parent_window)) {
- screen_list = base::WrapUnique(
- new DesktopMediaListAsh(DesktopMediaListAsh::SCREENS));
- }
+ screen_list = base::WrapUnique(
+ new DesktopMediaListAsh(DesktopMediaListAsh::SCREENS));
#endif
if (!screen_list) {
webrtc::DesktopCaptureOptions options =
@@ -166,10 +163,8 @@ bool DesktopCaptureChooseDesktopMediaFunctionBase::Execute(
// Create a windows list.
if (show_windows) {
#if defined(USE_ASH)
- if (chrome::IsNativeWindowInAsh(parent_window)) {
- window_list = base::WrapUnique(
- new DesktopMediaListAsh(DesktopMediaListAsh::WINDOWS));
- }
+ window_list = base::WrapUnique(
+ new DesktopMediaListAsh(DesktopMediaListAsh::WINDOWS));
#endif
if (!window_list) {
webrtc::DesktopCaptureOptions options =
« no previous file with comments | « no previous file | chrome/browser/ui/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698