chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc - Issue 2276823003: Change many chrome/browser includes to use qualified paths.

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

Issue 2276823003: Change many chrome/browser includes to use qualified paths. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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

« chrome/browser/DEPS ('K') | « chrome/browser/ui/views/crypto_module_password_dialog_view.cc ('k') | chrome/browser/ui/views/desktop_media_picker_views_deprecated.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 "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/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/web_modal/web_contents_modal_dialog_manager.h"	19 #include "components/web_modal/web_contents_modal_dialog_manager.h"

19 #include "content/public/browser/browser_thread.h"	20 #include "content/public/browser/browser_thread.h"

20 #include "content/public/browser/render_frame_host.h"	21 #include "content/public/browser/render_frame_host.h"

21 #include "content/public/browser/web_contents_delegate.h"	22 #include "content/public/browser/web_contents_delegate.h"

22 #include "extensions/common/switches.h"	23 #include "extensions/common/switches.h"

23 #include "grit/components_strings.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"

26 #include "ui/events/keycodes/keyboard_codes.h"	26 #include "ui/events/keycodes/keyboard_codes.h"

27 #include "ui/gfx/canvas.h"	27 #include "ui/gfx/canvas.h"

28 #include "ui/views/background.h"	28 #include "ui/views/background.h"

29 #include "ui/views/controls/button/checkbox.h"	29 #include "ui/views/controls/button/checkbox.h"

30 #include "ui/views/controls/scroll_view.h"	30 #include "ui/views/controls/scroll_view.h"

31 #include "ui/views/controls/tabbed_pane/tabbed_pane.h"	31 #include "ui/views/controls/tabbed_pane/tabbed_pane.h"

32 #include "ui/views/layout/box_layout.h"	32 #include "ui/views/layout/box_layout.h"

33 #include "ui/views/layout/layout_constants.h"	33 #include "ui/views/layout/layout_constants.h"

(...skipping 407 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
441	441

442 // static	442 // static

443 std::unique_ptr<DesktopMediaPicker> DesktopMediaPicker::Create() {	443 std::unique_ptr<DesktopMediaPicker> DesktopMediaPicker::Create() {

444 if (base::CommandLine::ForCurrentProcess()->HasSwitch(	444 if (base::CommandLine::ForCurrentProcess()->HasSwitch(

445 extensions::switches::kDisableDesktopCapturePickerNewUI)) {	445 extensions::switches::kDisableDesktopCapturePickerNewUI)) {

446 return std::unique_ptr<DesktopMediaPicker>(	446 return std::unique_ptr<DesktopMediaPicker>(

447 new deprecated::DesktopMediaPickerViews());	447 new deprecated::DesktopMediaPickerViews());

448 }	448 }

449 return std::unique_ptr<DesktopMediaPicker>(new DesktopMediaPickerViews());	449 return std::unique_ptr<DesktopMediaPicker>(new DesktopMediaPickerViews());

450 }	450 }

OLD	NEW