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

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

Issue 1125333003: Remove CheckMediaAccessPermission() from ContentBrowserClient. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 | « no previous file | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 #if defined(OS_POSIX) && !defined(OS_MACOSX) 242 #if defined(OS_POSIX) && !defined(OS_MACOSX)
243 void GetAdditionalMappedFilesForChildProcess( 243 void GetAdditionalMappedFilesForChildProcess(
244 const base::CommandLine& command_line, 244 const base::CommandLine& command_line,
245 int child_process_id, 245 int child_process_id,
246 content::FileDescriptorInfo* mappings) override; 246 content::FileDescriptorInfo* mappings) override;
247 #endif 247 #endif
248 #if defined(OS_WIN) 248 #if defined(OS_WIN)
249 const wchar_t* GetResourceDllName() override; 249 const wchar_t* GetResourceDllName() override;
250 void PreSpawnRenderer(sandbox::TargetPolicy* policy, bool* success) override; 250 void PreSpawnRenderer(sandbox::TargetPolicy* policy, bool* success) override;
251 #endif 251 #endif
252 bool CheckMediaAccessPermission(content::BrowserContext* browser_context,
253 const GURL& security_origin,
254 content::MediaStreamType type) override;
255 252
256 void OpenURL(content::BrowserContext* browser_context, 253 void OpenURL(content::BrowserContext* browser_context,
257 const content::OpenURLParams& params, 254 const content::OpenURLParams& params,
258 const base::Callback<void(content::WebContents*)>& callback) 255 const base::Callback<void(content::WebContents*)>& callback)
259 override; 256 override;
260 257
261 void RecordURLMetric(const std::string& metric, const GURL& url) override; 258 void RecordURLMetric(const std::string& metric, const GURL& url) override;
262 259
263 private: 260 private:
264 friend class DisableWebRtcEncryptionFlagTest; 261 friend class DisableWebRtcEncryptionFlagTest;
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 std::vector<ChromeContentBrowserClientParts*> extra_parts_; 309 std::vector<ChromeContentBrowserClientParts*> extra_parts_;
313 310
314 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; 311 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_;
315 312
316 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); 313 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
317 }; 314 };
318 315
319 } // namespace chrome 316 } // namespace chrome
320 317
321 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 318 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698