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

Unified Diff: chrome/browser/ui/views/desktop_media_picker_views.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 | « chrome/browser/ui/views/chrome_views_delegate_ash.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/desktop_media_picker_views.cc
diff --git a/chrome/browser/ui/views/desktop_media_picker_views.cc b/chrome/browser/ui/views/desktop_media_picker_views.cc
index ac09e1bda50d1ca091553b4b28230364aa1aef3b..738366511c23a85bde618c06edeb809437e0a4c7 100644
--- a/chrome/browser/ui/views/desktop_media_picker_views.cc
+++ b/chrome/browser/ui/views/desktop_media_picker_views.cc
@@ -13,7 +13,6 @@
#include "build/build_config.h"
#include "chrome/browser/media/combined_desktop_media_list.h"
#include "chrome/browser/media/desktop_media_list.h"
-#include "chrome/browser/ui/ash/ash_util.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/grit/generated_resources.h"
#include "components/constrained_window/constrained_window_views.h"
@@ -59,6 +58,7 @@ const int kDesktopMediaSourceViewGroupId = 1;
const char kDesktopMediaSourceViewClassName[] =
"DesktopMediaPicker_DesktopMediaSourceView";
+#if !defined(USE_ASH)
DesktopMediaID::Id AcceleratedWidgetToDesktopMediaId(
gfx::AcceleratedWidget accelerated_widget) {
#if defined(OS_WIN)
@@ -67,6 +67,7 @@ DesktopMediaID::Id AcceleratedWidgetToDesktopMediaId(
return static_cast<DesktopMediaID::Id>(accelerated_widget);
#endif
}
+#endif
int GetMediaListViewHeightForRows(size_t rows) {
return kListItemHeight * rows;
@@ -478,16 +479,11 @@ DesktopMediaPickerDialogView::DesktopMediaPickerDialogView(
dialog_window_id = DesktopMediaID::RegisterAuraWindow(
DesktopMediaID::TYPE_WINDOW, widget->GetNativeWindow());
- bool is_ash_window = false;
-#if defined(USE_ASH)
- is_ash_window = chrome::IsNativeWindowInAsh(widget->GetNativeWindow());
-#endif
-
// Set native window ID if the windows is outside Ash.
- if (!is_ash_window) {
- dialog_window_id.id = AcceleratedWidgetToDesktopMediaId(
- widget->GetNativeWindow()->GetHost()->GetAcceleratedWidget());
- }
+#if !defined(USE_ASH)
+ dialog_window_id.id = AcceleratedWidgetToDesktopMediaId(
+ widget->GetNativeWindow()->GetHost()->GetAcceleratedWidget());
+#endif
}
sources_list_view_->StartUpdating(dialog_window_id);
« no previous file with comments | « chrome/browser/ui/views/chrome_views_delegate_ash.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698