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

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

Issue 501713002: Fix DesktopMediaPickerViews to handle background parent_web_contents (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
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 | Annotate | Revision Log
« 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 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 bool selected_; 105 bool selected_;
106 106
107 DISALLOW_COPY_AND_ASSIGN(DesktopMediaSourceView); 107 DISALLOW_COPY_AND_ASSIGN(DesktopMediaSourceView);
108 }; 108 };
109 109
110 // Dialog view used for DesktopMediaPickerViews. 110 // Dialog view used for DesktopMediaPickerViews.
111 class DesktopMediaPickerDialogView : public views::DialogDelegateView { 111 class DesktopMediaPickerDialogView : public views::DialogDelegateView {
112 public: 112 public:
113 DesktopMediaPickerDialogView(content::WebContents* parent_web_contents, 113 DesktopMediaPickerDialogView(content::WebContents* parent_web_contents,
114 gfx::NativeWindow context, 114 gfx::NativeWindow context,
115 gfx::NativeWindow parent_window,
116 DesktopMediaPickerViews* parent, 115 DesktopMediaPickerViews* parent,
117 const base::string16& app_name, 116 const base::string16& app_name,
118 const base::string16& target_name, 117 const base::string16& target_name,
119 scoped_ptr<DesktopMediaList> media_list); 118 scoped_ptr<DesktopMediaList> media_list);
120 virtual ~DesktopMediaPickerDialogView(); 119 virtual ~DesktopMediaPickerDialogView();
121 120
122 // Called by parent (DesktopMediaPickerViews) when it's destroyed. 121 // Called by parent (DesktopMediaPickerViews) when it's destroyed.
123 void DetachParent(); 122 void DetachParent();
124 123
125 // Called by DesktopMediaListView. 124 // Called by DesktopMediaListView.
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 179
181 // The |dialog_| is owned by the corresponding views::Widget instance. 180 // The |dialog_| is owned by the corresponding views::Widget instance.
182 // When DesktopMediaPickerViews is destroyed the |dialog_| is destroyed 181 // When DesktopMediaPickerViews is destroyed the |dialog_| is destroyed
183 // asynchronously by closing the widget. 182 // asynchronously by closing the widget.
184 DesktopMediaPickerDialogView* dialog_; 183 DesktopMediaPickerDialogView* dialog_;
185 184
186 DISALLOW_COPY_AND_ASSIGN(DesktopMediaPickerViews); 185 DISALLOW_COPY_AND_ASSIGN(DesktopMediaPickerViews);
187 }; 186 };
188 187
189 #endif // CHROME_BROWSER_UI_VIEWS_DESKTOP_MEDIA_PICKER_VIEWS_H_ 188 #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