Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(609)

Side by Side Diff: chrome/browser/ui/views/desktop_media_picker_views_deprecated.h

Issue 1962073002: Desktop Capture Picker New UI: Non Mac Structure Change (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Unittest Crash Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_VIEWS_DESKTOP_MEDIA_PICKER_VIEWS_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_DESKTOP_MEDIA_PICKER_VIEWS_DEPRECATED_H_
6 #define CHROME_BROWSER_UI_VIEWS_DESKTOP_MEDIA_PICKER_VIEWS_H_ 6 #define CHROME_BROWSER_UI_VIEWS_DESKTOP_MEDIA_PICKER_VIEWS_DEPRECATED_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "chrome/browser/media/desktop_media_list_observer.h" 9 #include "chrome/browser/media/desktop_media_list_observer.h"
10 #include "chrome/browser/media/desktop_media_picker.h" 10 #include "chrome/browser/media/desktop_media_picker.h"
11 #include "ui/views/window/dialog_delegate.h" 11 #include "ui/views/window/dialog_delegate.h"
12 12
13 namespace views { 13 namespace views {
14 class ImageView; 14 class ImageView;
15 class Label; 15 class Label;
16 class Checkbox; 16 class Checkbox;
17 } // namespace views 17 } // namespace views
18 18
19 // TODO(qiangchen): Remove this file after new UI is done, and remove related
20 // resource strings, such as IDS_DESKTOP_MEDIA_PICKER_AUDIO_SHARE_TOOLTIP_NONE.
21 namespace deprecated {
22
19 class DesktopMediaPickerDialogView; 23 class DesktopMediaPickerDialogView;
20 class DesktopMediaPickerViews; 24 class DesktopMediaPickerViews;
21 class DesktopMediaSourceView; 25 class DesktopMediaSourceView;
22 26
23 // View that shows a list of desktop media sources available from 27 // View that shows a list of desktop media sources available from
24 // DesktopMediaList. 28 // DesktopMediaList.
25 class DesktopMediaListView : public views::View, 29 class DesktopMediaListView : public views::View,
26 public DesktopMediaListObserver { 30 public DesktopMediaListObserver {
27 public: 31 public:
28 DesktopMediaListView(DesktopMediaPickerDialogView* parent, 32 DesktopMediaListView(DesktopMediaPickerDialogView* parent,
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 DoneCallback callback_; 198 DoneCallback callback_;
195 199
196 // The |dialog_| is owned by the corresponding views::Widget instance. 200 // The |dialog_| is owned by the corresponding views::Widget instance.
197 // When DesktopMediaPickerViews is destroyed the |dialog_| is destroyed 201 // When DesktopMediaPickerViews is destroyed the |dialog_| is destroyed
198 // asynchronously by closing the widget. 202 // asynchronously by closing the widget.
199 DesktopMediaPickerDialogView* dialog_; 203 DesktopMediaPickerDialogView* dialog_;
200 204
201 DISALLOW_COPY_AND_ASSIGN(DesktopMediaPickerViews); 205 DISALLOW_COPY_AND_ASSIGN(DesktopMediaPickerViews);
202 }; 206 };
203 207
204 #endif // CHROME_BROWSER_UI_VIEWS_DESKTOP_MEDIA_PICKER_VIEWS_H_ 208 } // namespace deprecated
209
210 #endif // CHROME_BROWSER_UI_VIEWS_DESKTOP_MEDIA_PICKER_VIEWS_DEPRECATED_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698