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

Side by Side Diff: chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.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
OLDNEW
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 "chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.h" 5 #include "chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.h"
6 6
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "chrome/browser/media/desktop_media_list.h" 9 #include "chrome/browser/media/webrtc/desktop_media_list.h"
10 #include "chrome/browser/ui/browser_finder.h" 10 #include "chrome/browser/ui/browser_finder.h"
11 #include "chrome/browser/ui/browser_window.h" 11 #include "chrome/browser/ui/browser_window.h"
12 #include "chrome/browser/ui/views/desktop_capture/desktop_media_list_view.h" 12 #include "chrome/browser/ui/views/desktop_capture/desktop_media_list_view.h"
13 #include "chrome/browser/ui/views/desktop_capture/desktop_media_source_view.h" 13 #include "chrome/browser/ui/views/desktop_capture/desktop_media_source_view.h"
14 #include "chrome/browser/ui/views/desktop_media_picker_views_deprecated.h" 14 #include "chrome/browser/ui/views/desktop_media_picker_views_deprecated.h"
15 #include "chrome/grit/chromium_strings.h" 15 #include "chrome/grit/chromium_strings.h"
16 #include "chrome/grit/generated_resources.h" 16 #include "chrome/grit/generated_resources.h"
17 #include "components/constrained_window/constrained_window_views.h" 17 #include "components/constrained_window/constrained_window_views.h"
18 #include "components/strings/grit/components_strings.h" 18 #include "components/strings/grit/components_strings.h"
19 #include "components/web_modal/web_contents_modal_dialog_manager.h" 19 #include "components/web_modal/web_contents_modal_dialog_manager.h"
(...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after
445 445
446 // static 446 // static
447 std::unique_ptr<DesktopMediaPicker> DesktopMediaPicker::Create() { 447 std::unique_ptr<DesktopMediaPicker> DesktopMediaPicker::Create() {
448 if (base::CommandLine::ForCurrentProcess()->HasSwitch( 448 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
449 extensions::switches::kDisableDesktopCapturePickerNewUI)) { 449 extensions::switches::kDisableDesktopCapturePickerNewUI)) {
450 return std::unique_ptr<DesktopMediaPicker>( 450 return std::unique_ptr<DesktopMediaPicker>(
451 new deprecated::DesktopMediaPickerViews()); 451 new deprecated::DesktopMediaPickerViews());
452 } 452 }
453 return std::unique_ptr<DesktopMediaPicker>(new DesktopMediaPickerViews()); 453 return std::unique_ptr<DesktopMediaPicker>(new DesktopMediaPickerViews());
454 } 454 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698