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

Side by Side Diff: chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.h

Issue 1990053002: Desktop Capture Picker New UI: Non Mac Appearance Change (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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_CAPTURE_DESKTOP_MEDIA_PICKER_VIEWS_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_DESKTOP_CAPTURE_DESKTOP_MEDIA_PICKER_VIEWS_H_
6 #define CHROME_BROWSER_UI_VIEWS_DESKTOP_CAPTURE_DESKTOP_MEDIA_PICKER_VIEWS_H_ 6 #define CHROME_BROWSER_UI_VIEWS_DESKTOP_CAPTURE_DESKTOP_MEDIA_PICKER_VIEWS_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "chrome/browser/media/desktop_media_picker.h" 9 #include "chrome/browser/media/desktop_media_picker.h"
10 #include "ui/views/controls/label.h" 10 #include "ui/views/controls/label.h"
11 #include "ui/views/controls/tabbed_pane/tabbed_pane_listener.h" 11 #include "ui/views/controls/tabbed_pane/tabbed_pane_listener.h"
12 #include "ui/views/window/dialog_delegate.h" 12 #include "ui/views/window/dialog_delegate.h"
13 13
14 namespace views { 14 namespace views {
15 class Checkbox; 15 class Checkbox;
16 class TabbedPane; 16 class TabbedPane;
17 } // namespace views 17 } // namespace views
18 18
19 class DesktopMediaListView; 19 class DesktopMediaListView;
20 class DesktopMediaSourceView; 20 class DesktopMediaSourceView;
21
msw 2016/05/20 23:26:37 nit: remove
qiangchen 2016/05/24 00:03:37 Done.
21 class DesktopMediaPickerViews; 22 class DesktopMediaPickerViews;
22 23
23 // Dialog view used for DesktopMediaPickerViews. 24 // Dialog view used for DesktopMediaPickerViews.
24 class DesktopMediaPickerDialogView : public views::DialogDelegateView, 25 class DesktopMediaPickerDialogView : public views::DialogDelegateView,
25 public views::TabbedPaneListener { 26 public views::TabbedPaneListener {
26 public: 27 public:
27 DesktopMediaPickerDialogView(content::WebContents* parent_web_contents, 28 DesktopMediaPickerDialogView(content::WebContents* parent_web_contents,
28 gfx::NativeWindow context, 29 gfx::NativeWindow context,
29 DesktopMediaPickerViews* parent, 30 DesktopMediaPickerViews* parent,
30 const base::string16& app_name, 31 const base::string16& app_name,
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 124
124 // The |dialog_| is owned by the corresponding views::Widget instance. 125 // The |dialog_| is owned by the corresponding views::Widget instance.
125 // When DesktopMediaPickerViews is destroyed the |dialog_| is destroyed 126 // When DesktopMediaPickerViews is destroyed the |dialog_| is destroyed
126 // asynchronously by closing the widget. 127 // asynchronously by closing the widget.
127 DesktopMediaPickerDialogView* dialog_; 128 DesktopMediaPickerDialogView* dialog_;
128 129
129 DISALLOW_COPY_AND_ASSIGN(DesktopMediaPickerViews); 130 DISALLOW_COPY_AND_ASSIGN(DesktopMediaPickerViews);
130 }; 131 };
131 132
132 #endif // CHROME_BROWSER_UI_VIEWS_DESKTOP_CAPTURE_DESKTOP_MEDIA_PICKER_VIEWS_H_ 133 #endif // CHROME_BROWSER_UI_VIEWS_DESKTOP_CAPTURE_DESKTOP_MEDIA_PICKER_VIEWS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698