Revert "Desktop Capture Picker New UI: Non Mac Structure Change"

chrome/browser/ui/views/desktop_media_picker_views.cc

Index: chrome/browser/ui/views/desktop_media_picker_views.cc
diff --git a/chrome/browser/ui/views/desktop_media_picker_views_deprecated.cc b/chrome/browser/ui/views/desktop_media_picker_views.cc
similarity index 95%
rename from chrome/browser/ui/views/desktop_media_picker_views_deprecated.cc
rename to chrome/browser/ui/views/desktop_media_picker_views.cc
index 808c2d4e0b74867f468ef9fc9efbe40b51aa7c36..ac09e1bda50d1ca091553b4b28230364aa1aef3b 100644
--- a/chrome/browser/ui/views/desktop_media_picker_views_deprecated.cc
+++ b/chrome/browser/ui/views/desktop_media_picker_views.cc
@@ -2,7 +2,7 @@
 // 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>
@@ -74,15 +74,14 @@ int GetMediaListViewHeightForRows(size_t 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);
@@ -133,8 +132,8 @@ const char* DesktopMediaSourceView::GetClassName() const {
 }
 
 void DesktopMediaSourceView::Layout() {
-  image_view_->SetBounds(kThumbnailMargin, kThumbnailMargin, kThumbnailWidth,
-                         kThumbnailHeight);
+  image_view_->SetBounds(kThumbnailMargin, kThumbnailMargin,
+                         kThumbnailWidth, kThumbnailHeight);
   label_->SetBounds(kThumbnailMargin, kThumbnailHeight + kThumbnailMargin,
                     kThumbnailWidth, kLabelHeight);
 }
@@ -463,8 +462,8 @@ DesktopMediaPickerDialogView::DesktopMediaPickerDialogView(
       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();
@@ -510,8 +509,7 @@ ui::ModalType DesktopMediaPickerDialogView::GetModalType() const {
 }
 
 base::string16 DesktopMediaPickerDialogView::GetWindowTitle() const {
-  return l10n_util::GetStringFUTF16(
-      IDS_DESKTOP_MEDIA_PICKER_TITLE_DEPRECATED, app_name_);
+  return l10n_util::GetStringFUTF16(IDS_DESKTOP_MEDIA_PICKER_TITLE, app_name_);
 }
 
 bool DesktopMediaPickerDialogView::IsDialogButtonEnabled(
@@ -527,9 +525,8 @@ views::View* DesktopMediaPickerDialogView::GetInitiallyFocusedView() {
 
 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() {
@@ -626,7 +623,8 @@ DesktopMediaPickerDialogView::GetMediaSourceViewForTesting(int index) const {
       sources_list_view_->child_at(index));
 }
 
-DesktopMediaPickerViews::DesktopMediaPickerViews() : dialog_(NULL) {}
+DesktopMediaPickerViews::DesktopMediaPickerViews() : dialog_(NULL) {
+}
 
 DesktopMediaPickerViews::~DesktopMediaPickerViews() {
   if (dialog_) {
@@ -662,9 +660,13 @@ void DesktopMediaPickerViews::NotifyDialogResult(DesktopMediaID source) {
 
   // 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());
+}