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

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

Issue 529293002: Fix DesktopMediaPickerViews to handle background parent_web_contents (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2125
Patch Set: Created 6 years, 3 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
« no previous file with comments | « no previous file | chrome/browser/ui/views/desktop_media_picker_views.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_H_
6 #define CHROME_BROWSER_UI_VIEWS_DESKTOP_MEDIA_PICKER_VIEWS_H_ 6 #define CHROME_BROWSER_UI_VIEWS_DESKTOP_MEDIA_PICKER_VIEWS_H_
7 7
8 #include "chrome/browser/media/desktop_media_list_observer.h" 8 #include "chrome/browser/media/desktop_media_list_observer.h"
9 #include "chrome/browser/media/desktop_media_picker.h" 9 #include "chrome/browser/media/desktop_media_picker.h"
10 #include "ui/views/window/dialog_delegate.h" 10 #include "ui/views/window/dialog_delegate.h"
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 bool selected_; 101 bool selected_;
102 102
103 DISALLOW_COPY_AND_ASSIGN(DesktopMediaSourceView); 103 DISALLOW_COPY_AND_ASSIGN(DesktopMediaSourceView);
104 }; 104 };
105 105
106 // Dialog view used for DesktopMediaPickerViews. 106 // Dialog view used for DesktopMediaPickerViews.
107 class DesktopMediaPickerDialogView : public views::DialogDelegateView { 107 class DesktopMediaPickerDialogView : public views::DialogDelegateView {
108 public: 108 public:
109 DesktopMediaPickerDialogView(content::WebContents* parent_web_contents, 109 DesktopMediaPickerDialogView(content::WebContents* parent_web_contents,
110 gfx::NativeWindow context, 110 gfx::NativeWindow context,
111 gfx::NativeWindow parent_window,
112 DesktopMediaPickerViews* parent, 111 DesktopMediaPickerViews* parent,
113 const base::string16& app_name, 112 const base::string16& app_name,
114 const base::string16& target_name, 113 const base::string16& target_name,
115 scoped_ptr<DesktopMediaList> media_list); 114 scoped_ptr<DesktopMediaList> media_list);
116 virtual ~DesktopMediaPickerDialogView(); 115 virtual ~DesktopMediaPickerDialogView();
117 116
118 // Called by parent (DesktopMediaPickerViews) when it's destroyed. 117 // Called by parent (DesktopMediaPickerViews) when it's destroyed.
119 void DetachParent(); 118 void DetachParent();
120 119
121 // Called by DesktopMediaListView. 120 // Called by DesktopMediaListView.
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 175
177 // The |dialog_| is owned by the corresponding views::Widget instance. 176 // The |dialog_| is owned by the corresponding views::Widget instance.
178 // When DesktopMediaPickerViews is destroyed the |dialog_| is destroyed 177 // When DesktopMediaPickerViews is destroyed the |dialog_| is destroyed
179 // asynchronously by closing the widget. 178 // asynchronously by closing the widget.
180 DesktopMediaPickerDialogView* dialog_; 179 DesktopMediaPickerDialogView* dialog_;
181 180
182 DISALLOW_COPY_AND_ASSIGN(DesktopMediaPickerViews); 181 DISALLOW_COPY_AND_ASSIGN(DesktopMediaPickerViews);
183 }; 182 };
184 183
185 #endif // CHROME_BROWSER_UI_VIEWS_DESKTOP_MEDIA_PICKER_VIEWS_H_ 184 #endif // CHROME_BROWSER_UI_VIEWS_DESKTOP_MEDIA_PICKER_VIEWS_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/desktop_media_picker_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698