chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc - Issue 535203003: Replace Profile* in declarative_api with BrowserContext*

Side by Side Diff: chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc

Issue 535203003: Replace Profile* in declarative_api with BrowserContext* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove changes to unit-test; those have to wait until move. 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

« no previous file with comments | « chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry.cc ('k') | chrome/browser/extensions/api/page_capture/page_capture_api.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/extensions/api/desktop_capture/desktop_capture_api.h"	5 #include "chrome/browser/extensions/api/desktop_capture/desktop_capture_api.h"

6	6

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

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

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

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

11 #include "chrome/browser/extensions/extension_tab_util.h"	11 #include "chrome/browser/extensions/extension_tab_util.h"

12 #include "chrome/browser/media/desktop_media_list_ash.h"	12 #include "chrome/browser/media/desktop_media_list_ash.h"

13 #include "chrome/browser/media/desktop_streams_registry.h"	13 #include "chrome/browser/media/desktop_streams_registry.h"

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

15 #include "chrome/browser/media/native_desktop_media_list.h"	15 #include "chrome/browser/media/native_desktop_media_list.h"

	16 #include "chrome/browser/profiles/profile.h"

16 #include "chrome/browser/ui/ash/ash_util.h"	17 #include "chrome/browser/ui/ash/ash_util.h"

17 #include "chrome/browser/ui/host_desktop.h"	18 #include "chrome/browser/ui/host_desktop.h"

18 #include "chrome/common/chrome_switches.h"	19 #include "chrome/common/chrome_switches.h"

19 #include "chrome/common/extensions/api/tabs.h"	20 #include "chrome/common/extensions/api/tabs.h"

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

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

22 #include "content/public/browser/render_view_host.h"	23 #include "content/public/browser/render_view_host.h"

23 #include "content/public/browser/web_contents.h"	24 #include "content/public/browser/web_contents.h"

24 #include "net/base/net_util.h"	25 #include "net/base/net_util.h"

25 #include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h"	26 #include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h"

(...skipping 270 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
296	297

297 void DesktopCaptureRequestsRegistry::CancelRequest(int process_id,	298 void DesktopCaptureRequestsRegistry::CancelRequest(int process_id,

298 int request_id) {	299 int request_id) {

299 RequestsMap::iterator it = requests_.find(RequestId(process_id, request_id));	300 RequestsMap::iterator it = requests_.find(RequestId(process_id, request_id));

300 if (it != requests_.end())	301 if (it != requests_.end())

301 it->second->Cancel();	302 it->second->Cancel();

302 }	303 }

303	304

304	305

305 } // namespace extensions	306 } // namespace extensions

OLD	NEW