chrome/browser/ui/views/desktop_media_picker_views_deprecated.cc - Issue 2307083002: Cleanup: move WebRTC related files from chrome/browser/media to chrome/browser/media/webrtc/

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2307083002: Cleanup: move WebRTC related files from chrome/browser/media to chrome/browser/media/webrtc/ (Closed)

Patch Set: Removed file wrongly resuscitated during rebase Created 4 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 | « chrome/browser/ui/views/desktop_media_picker_views_deprecated.h ('k') | chrome/browser/ui/views/desktop_media_picker_views_deprecated_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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 #include "desktop_media_picker_views_deprecated.h"	5 #include "desktop_media_picker_views_deprecated.h"

6	6

7 #include <stddef.h>	7 #include <stddef.h>

8 #include <utility>	8 #include <utility>

9	9

10 #include "base/callback.h"	10 #include "base/callback.h"

11 #include "base/command_line.h"	11 #include "base/command_line.h"

12 #include "base/strings/utf_string_conversions.h"	12 #include "base/strings/utf_string_conversions.h"

13 #include "build/build_config.h"	13 #include "build/build_config.h"

14 #include "chrome/browser/media/combined_desktop_media_list.h"	14 #include "chrome/browser/media/combined_desktop_media_list.h"

15 #include "chrome/browser/media/desktop_media_list.h"	15 #include "chrome/browser/media/webrtc/desktop_media_list.h"

16 #include "chrome/common/chrome_switches.h"	16 #include "chrome/common/chrome_switches.h"

17 #include "chrome/grit/generated_resources.h"	17 #include "chrome/grit/generated_resources.h"

18 #include "components/constrained_window/constrained_window_views.h"	18 #include "components/constrained_window/constrained_window_views.h"

19 #include "components/strings/grit/components_strings.h"	19 #include "components/strings/grit/components_strings.h"

20 #include "components/web_modal/web_contents_modal_dialog_manager.h"	20 #include "components/web_modal/web_contents_modal_dialog_manager.h"

21 #include "content/public/browser/browser_thread.h"	21 #include "content/public/browser/browser_thread.h"

22 #include "content/public/browser/render_frame_host.h"	22 #include "content/public/browser/render_frame_host.h"

23 #include "content/public/browser/web_contents_delegate.h"	23 #include "content/public/browser/web_contents_delegate.h"

24 #include "ui/aura/window_tree_host.h"	24 #include "ui/aura/window_tree_host.h"

25 #include "ui/base/l10n/l10n_util.h"	25 #include "ui/base/l10n/l10n_util.h"

(...skipping 631 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
657 DCHECK(!callback_.is_null());	657 DCHECK(!callback_.is_null());

658	658

659 // Notify the \|callback_\| asynchronously because it may need to destroy	659 // Notify the \|callback_\| asynchronously because it may need to destroy

660 // DesktopMediaPicker.	660 // DesktopMediaPicker.

661 content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE,	661 content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE,

662 base::Bind(callback_, source));	662 base::Bind(callback_, source));

663 callback_.Reset();	663 callback_.Reset();

664 }	664 }

665	665

666 } // namespace deprecated	666 } // namespace deprecated

OLD	NEW