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

chrome/browser/ui/views/desktop_media_picker_views.h

 // Copyright 2014 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.
 
-#ifndef CHROME_BROWSER_UI_VIEWS_DESKTOP_MEDIA_PICKER_VIEWS_DEPRECATED_H_
-#define CHROME_BROWSER_UI_VIEWS_DESKTOP_MEDIA_PICKER_VIEWS_DEPRECATED_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_DESKTOP_MEDIA_PICKER_VIEWS_H_
+#define CHROME_BROWSER_UI_VIEWS_DESKTOP_MEDIA_PICKER_VIEWS_H_
 
 #include "base/macros.h"
 #include "chrome/browser/media/desktop_media_list_observer.h"
 #include "chrome/browser/media/desktop_media_picker.h"
 #include "ui/views/window/dialog_delegate.h"
 
 namespace views {
 class ImageView;
 class Label;
 class Checkbox;
 }  // namespace views
 
-// TODO(qiangchen): Remove this file after new UI is done, and remove related
-// resource strings, such as IDS_DESKTOP_MEDIA_PICKER_AUDIO_SHARE_TOOLTIP_NONE.
-namespace deprecated {
-
 class DesktopMediaPickerDialogView;
 class DesktopMediaPickerViews;
 class DesktopMediaSourceView;
 
 // View that shows a list of desktop media sources available from
 // DesktopMediaList.
 class DesktopMediaListView : public views::View,
                              public DesktopMediaListObserver {
  public:
   DesktopMediaListView(DesktopMediaPickerDialogView* parent,
@@ skipping 165 matching lines @@
   DoneCallback callback_;
 
   // The |dialog_| is owned by the corresponding views::Widget instance.
   // When DesktopMediaPickerViews is destroyed the |dialog_| is destroyed
   // asynchronously by closing the widget.
   DesktopMediaPickerDialogView* dialog_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopMediaPickerViews);
 };
 
-}  // namespace deprecated
-
-#endif  // CHROME_BROWSER_UI_VIEWS_DESKTOP_MEDIA_PICKER_VIEWS_DEPRECATED_H_
+#endif  // CHROME_BROWSER_UI_VIEWS_DESKTOP_MEDIA_PICKER_VIEWS_H_