chrome/browser/media/media_capture_devices_dispatcher.cc - Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources.

Side by Side Diff: chrome/browser/media/media_capture_devices_dispatcher.cc

Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 4 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 | « chrome/browser/media/desktop_media_list_ash.cc ('k') | chrome/browser/media/media_stream_capture_indicator.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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/media/media_capture_devices_dispatcher.h"	5 #include "chrome/browser/media/media_capture_devices_dispatcher.h"

6	6

7 #include "apps/app_window.h"	7 #include "apps/app_window.h"

8 #include "apps/app_window_registry.h"	8 #include "apps/app_window_registry.h"

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

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

(...skipping 10 matching lines...) Expand all Loading...
21 #include "chrome/browser/profiles/profile.h"	21 #include "chrome/browser/profiles/profile.h"

22 #include "chrome/browser/ui/browser.h"	22 #include "chrome/browser/ui/browser.h"

23 #include "chrome/browser/ui/browser_finder.h"	23 #include "chrome/browser/ui/browser_finder.h"

24 #include "chrome/browser/ui/browser_window.h"	24 #include "chrome/browser/ui/browser_window.h"

25 #include "chrome/browser/ui/screen_capture_notification_ui.h"	25 #include "chrome/browser/ui/screen_capture_notification_ui.h"

26 #include "chrome/browser/ui/simple_message_box.h"	26 #include "chrome/browser/ui/simple_message_box.h"

27 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h"	27 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h"

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

29 #include "chrome/common/chrome_version_info.h"	29 #include "chrome/common/chrome_version_info.h"

30 #include "chrome/common/pref_names.h"	30 #include "chrome/common/pref_names.h"

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

31 #include "components/pref_registry/pref_registry_syncable.h"	32 #include "components/pref_registry/pref_registry_syncable.h"

32 #include "content/public/browser/browser_thread.h"	33 #include "content/public/browser/browser_thread.h"

33 #include "content/public/browser/desktop_media_id.h"	34 #include "content/public/browser/desktop_media_id.h"

34 #include "content/public/browser/media_capture_devices.h"	35 #include "content/public/browser/media_capture_devices.h"

35 #include "content/public/browser/notification_service.h"	36 #include "content/public/browser/notification_service.h"

36 #include "content/public/browser/notification_source.h"	37 #include "content/public/browser/notification_source.h"

37 #include "content/public/browser/notification_types.h"	38 #include "content/public/browser/notification_types.h"

38 #include "content/public/browser/render_frame_host.h"	39 #include "content/public/browser/render_frame_host.h"

39 #include "content/public/browser/render_process_host.h"	40 #include "content/public/browser/render_process_host.h"

40 #include "content/public/browser/web_contents.h"	41 #include "content/public/browser/web_contents.h"

41 #include "content/public/common/media_stream_request.h"	42 #include "content/public/common/media_stream_request.h"

42 #include "extensions/common/constants.h"	43 #include "extensions/common/constants.h"

43 #include "extensions/common/extension.h"	44 #include "extensions/common/extension.h"

44 #include "extensions/common/permissions/permissions_data.h"	45 #include "extensions/common/permissions/permissions_data.h"

45 #include "grit/generated_resources.h"

46 #include "media/audio/audio_manager_base.h"	46 #include "media/audio/audio_manager_base.h"

47 #include "media/base/media_switches.h"	47 #include "media/base/media_switches.h"

48 #include "net/base/net_util.h"	48 #include "net/base/net_util.h"

49 #include "third_party/webrtc/modules/desktop_capture/desktop_capture_types.h"	49 #include "third_party/webrtc/modules/desktop_capture/desktop_capture_types.h"

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

51	51

52 #if defined(OS_CHROMEOS)	52 #if defined(OS_CHROMEOS)

53 #include "ash/shell.h"	53 #include "ash/shell.h"

54 #endif // defined(OS_CHROMEOS)	54 #endif // defined(OS_CHROMEOS)

55	55

(...skipping 944 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1000	1000

1001 void MediaCaptureDevicesDispatcher::SetTestAudioCaptureDevices(	1001 void MediaCaptureDevicesDispatcher::SetTestAudioCaptureDevices(

1002 const MediaStreamDevices& devices) {	1002 const MediaStreamDevices& devices) {

1003 test_audio_devices_ = devices;	1003 test_audio_devices_ = devices;

1004 }	1004 }

1005	1005

1006 void MediaCaptureDevicesDispatcher::SetTestVideoCaptureDevices(	1006 void MediaCaptureDevicesDispatcher::SetTestVideoCaptureDevices(

1007 const MediaStreamDevices& devices) {	1007 const MediaStreamDevices& devices) {

1008 test_video_devices_ = devices;	1008 test_video_devices_ = devices;

1009 }	1009 }

OLD	NEW