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

Side by Side Diff: chrome/browser/chrome_content_browser_client.h

Issue 483523006: Check all settings when checking mic and camera access (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Build fix for Android. 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 | Annotate | Revision Log
OLDNEW
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 #ifndef CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 virtual void GetAdditionalMappedFilesForChildProcess( 282 virtual void GetAdditionalMappedFilesForChildProcess(
283 const base::CommandLine& command_line, 283 const base::CommandLine& command_line,
284 int child_process_id, 284 int child_process_id,
285 std::vector<content::FileDescriptorInfo>* mappings) OVERRIDE; 285 std::vector<content::FileDescriptorInfo>* mappings) OVERRIDE;
286 #endif 286 #endif
287 #if defined(OS_WIN) 287 #if defined(OS_WIN)
288 virtual const wchar_t* GetResourceDllName() OVERRIDE; 288 virtual const wchar_t* GetResourceDllName() OVERRIDE;
289 virtual void PreSpawnRenderer(sandbox::TargetPolicy* policy, 289 virtual void PreSpawnRenderer(sandbox::TargetPolicy* policy,
290 bool* success) OVERRIDE; 290 bool* success) OVERRIDE;
291 #endif 291 #endif
292 virtual bool CheckMediaAccessPermission(
293 content::BrowserContext* browser_context,
294 const GURL& security_origin,
295 content::MediaStreamType type) OVERRIDE;
292 296
293 private: 297 private:
294 friend class DisableWebRtcEncryptionFlagTest; 298 friend class DisableWebRtcEncryptionFlagTest;
295 299
296 #if defined(ENABLE_WEBRTC) 300 #if defined(ENABLE_WEBRTC)
297 // Copies disable WebRTC encryption switch depending on the channel. 301 // Copies disable WebRTC encryption switch depending on the channel.
298 static void MaybeCopyDisableWebRtcEncryptionSwitch( 302 static void MaybeCopyDisableWebRtcEncryptionSwitch(
299 base::CommandLine* to_command_line, 303 base::CommandLine* to_command_line,
300 const base::CommandLine& from_command_line, 304 const base::CommandLine& from_command_line,
301 VersionInfo::Channel channel); 305 VersionInfo::Channel channel);
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 std::vector<ChromeContentBrowserClientParts*> extra_parts_; 349 std::vector<ChromeContentBrowserClientParts*> extra_parts_;
346 350
347 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; 351 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_;
348 352
349 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); 353 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
350 }; 354 };
351 355
352 } // namespace chrome 356 } // namespace chrome
353 357
354 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 358 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698