Add AshDesktopMediaList and enable Desktop Capture API on Chrome OS.

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/media/desktop_media_picker.h"
 
-#include "ash/shell.h"
 #include "base/callback.h"
 #include "chrome/browser/media/desktop_media_list.h"
 #include "chrome/browser/media/desktop_media_list_observer.h"
+#include "chrome/browser/ui/ash/ash_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/scroll_view.h"
 #include "ui/views/corewm/shadow_types.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_client_view.h"
 #include "ui/views/window/dialog_delegate.h"
 
 #if defined(USE_AURA)
 #include "ui/aura/root_window.h"
 #endif
 
-#if defined(OS_WIN)
-#include "ui/views/win/hwnd_util.h"
-#endif
-
 using content::DesktopMediaID;
 
 namespace {
 
 const int kThumbnailWidth = 160;
 const int kThumbnailHeight = 100;
 const int kThumbnailMargin = 10;
 const int kLabelHeight = 40;
 const int kListItemWidth = kThumbnailMargin * 2 + kThumbnailWidth;
 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";
 
+content::DesktopMediaID::Id AcceleratedWidgetToDesktopMediaId(
+    gfx::AcceleratedWidget accelerated_widget) {
+#if defined(OS_WIN)
+  return reinterpret_cast<content::DesktopMediaID::Id>(accelerated_widget);
+#else
+  return static_cast<content::DesktopMediaID::Id>(accelerated_widget);
+#endif
+}
+
 class DesktopMediaListView;
 class DesktopMediaPickerDialogView;
 class DesktopMediaPickerViews;
 
 // View used for each item in DesktopMediaListView. Shows a single desktop media
 // source as a thumbnail with the title under it.
 class DesktopMediaSourceView : public views::View {
  public:
   DesktopMediaSourceView(DesktopMediaListView* parent,
                          DesktopMediaID source_id);
@@ skipping 423 matching lines @@
   AddChildView(label_);
 
   scroll_view_->SetContents(list_view_);
   AddChildView(scroll_view_);
 
   DialogDelegate::CreateDialogWidget(this, context, parent_window);
 
   // DesktopMediaList needs to know the ID of the picker window which
   // matches the ID it gets from the OS. Depending on the OS and configuration
   // we get this ID differently.
-  //
-  // TODO(sergeyu): Update this code when Ash-specific window capturer is
-  // implemented. Currently this code will always get native windows ID
-  // which is not what we need in Ash. http://crbug.com/295102
-  content::DesktopMediaID::Id dialog_window_id;
+  content::DesktopMediaID::Id dialog_window_id = 0;
 
-#if defined(OS_WIN)
-  dialog_window_id = reinterpret_cast<content::DesktopMediaID::Id>(
-      views::HWNDForWidget(GetWidget()));
-#elif defined(USE_AURA)
-  dialog_window_id = static_cast<content::DesktopMediaID::Id>(
-      GetWidget()->GetNativeWindow()->GetDispatcher()->host()->
-          GetAcceleratedWidget());
-#else
+#if defined(USE_AURA)
+
+#if defined(USE_ASH)
+  if (chrome::IsNativeWindowInAsh(GetWidget()->GetNativeWindow())) {
+    dialog_window_id = content::DesktopMediaID::RegisterAuraWindow(
+        GetWidget()->GetNativeWindow()).id;
+  } else
+#endif
+  {
+    dialog_window_id = AcceleratedWidgetToDesktopMediaId(
+        GetWidget()->GetNativeWindow()->GetDispatcher()->host()->
+            GetAcceleratedWidget());
+  }
+
+#else  // defined(USE_AURA)
   dialog_window_id = 0;
   NOTIMPLEMENTED();
-#endif
+#endif  // !defined(USE_AURA)
 
   list_view_->StartUpdating(dialog_window_id);
 
   GetWidget()->Show();
 }
 
 DesktopMediaPickerDialogView::~DesktopMediaPickerDialogView() {}
 
 void DesktopMediaPickerDialogView::DetachParent() {
   parent_ = NULL;
@@ skipping 97 matching lines @@
       base::Bind(callback_, source));
   callback_.Reset();
 }
 
 }  // namespace
 
 // static
 scoped_ptr<DesktopMediaPicker> DesktopMediaPicker::Create() {
   return scoped_ptr<DesktopMediaPicker>(new DesktopMediaPickerViews());
 }