Revert "Desktop Capture Picker New UI: Non Mac Structure Change" (https://codereview.chromium.org/1…

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 "desktop_media_picker_views_deprecated.h"
+#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"
@@ skipping 51 matching lines @@
   return static_cast<DesktopMediaID::Id>(accelerated_widget);
 #endif
 }
 
 int GetMediaListViewHeightForRows(size_t rows) {
   return kListItemHeight * rows;
 }
 
 }  // namespace
 
-namespace deprecated {
-
-DesktopMediaSourceView::DesktopMediaSourceView(DesktopMediaListView* parent,
-                                               DesktopMediaID source_id)
+DesktopMediaSourceView::DesktopMediaSourceView(
+    DesktopMediaListView* parent,
+    DesktopMediaID source_id)
     : parent_(parent),
       source_id_(source_id),
       image_view_(new views::ImageView()),
       label_(new views::Label()),
-      selected_(false) {
+      selected_(false)  {
   AddChildView(image_view_);
   AddChildView(label_);
   SetFocusBehavior(FocusBehavior::ALWAYS);
 }
 
 DesktopMediaSourceView::~DesktopMediaSourceView() {}
 
 void DesktopMediaSourceView::SetName(const base::string16& name) {
   label_->SetText(name);
 }
@@ skipping 30 matching lines @@
   }
 
   SchedulePaint();
 }
 
 const char* DesktopMediaSourceView::GetClassName() const {
   return kDesktopMediaSourceViewClassName;
 }
 
 void DesktopMediaSourceView::Layout() {
-  image_view_->SetBounds(kThumbnailMargin, kThumbnailMargin, kThumbnailWidth,
-                         kThumbnailHeight);
+  image_view_->SetBounds(kThumbnailMargin, kThumbnailMargin,
+                         kThumbnailWidth, kThumbnailHeight);
   label_->SetBounds(kThumbnailMargin, kThumbnailHeight + kThumbnailMargin,
                     kThumbnailWidth, kLabelHeight);
 }
 
 views::View* DesktopMediaSourceView::GetSelectedViewForGroup(int group) {
   Views neighbours;
   parent()->GetViewsInGroup(group, &neighbours);
   if (neighbours.empty())
     return NULL;
 
@@ skipping 308 matching lines @@
   }
 
   // If |parent_web_contents| is set and it's not a background page then the
   // picker will be shown modal to the web contents. Otherwise the picker is
   // shown in a separate window.
   views::Widget* widget = NULL;
   bool modal_dialog =
       parent_web_contents &&
       !parent_web_contents->GetDelegate()->IsNeverVisible(parent_web_contents);
   if (modal_dialog) {
-    widget =
-        constrained_window::ShowWebModalDialogViews(this, parent_web_contents);
+    widget = constrained_window::ShowWebModalDialogViews(this,
+                                                         parent_web_contents);
   } else {
     widget = DialogDelegate::CreateDialogWidget(this, context, NULL);
     widget->Show();
   }
 
   // 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;
@@ skipping 41 matching lines @@
     return sources_list_view_->GetSelection() != NULL;
   return true;
 }
 
 views::View* DesktopMediaPickerDialogView::GetInitiallyFocusedView() {
   return sources_list_view_;
 }
 
 base::string16 DesktopMediaPickerDialogView::GetDialogButtonLabel(
     ui::DialogButton button) const {
-  return l10n_util::GetStringUTF16(button == ui::DIALOG_BUTTON_OK
-                                       ? IDS_DESKTOP_MEDIA_PICKER_SHARE
-                                       : IDS_CANCEL);
+  return l10n_util::GetStringUTF16(button == ui::DIALOG_BUTTON_OK ?
+      IDS_DESKTOP_MEDIA_PICKER_SHARE : IDS_CANCEL);
 }
 
 bool DesktopMediaPickerDialogView::Accept() {
   DesktopMediaSourceView* selection = sources_list_view_->GetSelection();
 
   // Ok button should only be enabled when a source is selected.
   DCHECK(selection);
   DesktopMediaID source = selection->source_id();
   source.audio_share = audio_share_checkbox_ &&
                        audio_share_checkbox_->enabled() &&
@@ skipping 76 matching lines @@
 
 DesktopMediaSourceView*
 DesktopMediaPickerDialogView::GetMediaSourceViewForTesting(int index) const {
   if (sources_list_view_->child_count() <= index)
     return NULL;
 
   return reinterpret_cast<DesktopMediaSourceView*>(
       sources_list_view_->child_at(index));
 }
 
-DesktopMediaPickerViews::DesktopMediaPickerViews() : dialog_(NULL) {}
+DesktopMediaPickerViews::DesktopMediaPickerViews() : dialog_(NULL) {
+}
 
 DesktopMediaPickerViews::~DesktopMediaPickerViews() {
   if (dialog_) {
     dialog_->DetachParent();
     dialog_->GetWidget()->Close();
   }
 }
 
 void DesktopMediaPickerViews::Show(
     content::WebContents* web_contents,
@@ skipping 15 matching lines @@
 
 void DesktopMediaPickerViews::NotifyDialogResult(DesktopMediaID source) {
   // Once this method is called the |dialog_| will close and destroy itself.
   dialog_->DetachParent();
   dialog_ = NULL;
 
   DCHECK(!callback_.is_null());
 
   // Notify the |callback_| asynchronously because it may need to destroy
   // DesktopMediaPicker.
-  content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE,
-                                   base::Bind(callback_, source));
+  content::BrowserThread::PostTask(
+      content::BrowserThread::UI, FROM_HERE,
+      base::Bind(callback_, source));
   callback_.Reset();
 }
 
-}  // namespace deprecated
+// static
+std::unique_ptr<DesktopMediaPicker> DesktopMediaPicker::Create() {
+  return std::unique_ptr<DesktopMediaPicker>(new DesktopMediaPickerViews());
+}