Remove OS_CHROMEOS from ui/ash code

chrome/browser/ui/views/desktop_media_picker_views.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/desktop_media_picker_views.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #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"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "grit/components_strings.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 25 matching lines @@
 const int kListItemHeight =
     kThumbnailMargin * 2 + kThumbnailHeight + kLabelHeight;
 const int kListColumns = 3;
 const int kTotalListWidth = kListColumns * kListItemWidth;
 
 const int kDesktopMediaSourceViewGroupId = 1;
 
 const char kDesktopMediaSourceViewClassName[] =
     "DesktopMediaPicker_DesktopMediaSourceView";
 
+#if !defined(USE_ASH)
 DesktopMediaID::Id AcceleratedWidgetToDesktopMediaId(
     gfx::AcceleratedWidget accelerated_widget) {
 #if defined(OS_WIN)
   return reinterpret_cast<DesktopMediaID::Id>(accelerated_widget);
 #else
   return static_cast<DesktopMediaID::Id>(accelerated_widget);
 #endif
 }
+#endif
 
 int GetMediaListViewHeightForRows(size_t rows) {
   return kListItemHeight * rows;
 }
 
 }  // namespace
 
 DesktopMediaSourceView::DesktopMediaSourceView(
     DesktopMediaListView* parent,
     DesktopMediaID source_id)
@@ skipping 391 matching lines @@
 
   // If the picker is not modal to the calling web contents then it is displayed
   // in its own top-level window, so in that case it needs to be filtered out of
   // the list of top-level windows available for capture, and to achieve that
   // the Id is passed to DesktopMediaList.
   DesktopMediaID dialog_window_id;
   if (!modal_dialog) {
     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());
+    // Set native window ID if the windows is outside Ash.
+#if !defined(USE_ASH)
+    dialog_window_id.id = AcceleratedWidgetToDesktopMediaId(
+        widget->GetNativeWindow()->GetHost()->GetAcceleratedWidget());
 #endif
-
-    // Set native window ID if the windows is outside Ash.
-    if (!is_ash_window) {
-      dialog_window_id.id = AcceleratedWidgetToDesktopMediaId(
-          widget->GetNativeWindow()->GetHost()->GetAcceleratedWidget());
-    }
   }
 
   sources_list_view_->StartUpdating(dialog_window_id);
 }
 
 DesktopMediaPickerDialogView::~DesktopMediaPickerDialogView() {}
 
 void DesktopMediaPickerDialogView::DetachParent() {
   parent_ = NULL;
 }
@@ skipping 162 matching lines @@
   content::BrowserThread::PostTask(
       content::BrowserThread::UI, FROM_HERE,
       base::Bind(callback_, source));
   callback_.Reset();
 }
 
 // static
 std::unique_ptr<DesktopMediaPicker> DesktopMediaPicker::Create() {
   return std::unique_ptr<DesktopMediaPicker>(new DesktopMediaPickerViews());
 }