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

Side by Side Diff: content/public/browser/content_browser_client.h

Issue 9845033: Move the MediaObserver getter from ResourceContext to ContentBrowserClient, since we only need to s… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix dcheck Created 8 years, 9 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 CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
6 #define CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ 6 #define CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 namespace ui { 56 namespace ui {
57 class Clipboard; 57 class Clipboard;
58 } 58 }
59 59
60 namespace content { 60 namespace content {
61 61
62 class AccessTokenStore; 62 class AccessTokenStore;
63 class BrowserChildProcessHost; 63 class BrowserChildProcessHost;
64 class BrowserContext; 64 class BrowserContext;
65 class BrowserMainParts; 65 class BrowserMainParts;
66 class MediaObserver;
67 class QuotaPermissionContext;
66 class RenderProcessHost; 68 class RenderProcessHost;
67 class QuotaPermissionContext; 69 class RenderViewHost;
68 class ResourceContext; 70 class ResourceContext;
69 class RenderViewHost;
70 class SiteInstance; 71 class SiteInstance;
71 class SpeechInputManagerDelegate; 72 class SpeechInputManagerDelegate;
72 class WebContents; 73 class WebContents;
73 class WebContentsView; 74 class WebContentsView;
74 class WebContentsViewDelegate; 75 class WebContentsViewDelegate;
75 class WebUIControllerFactory; 76 class WebUIControllerFactory;
76 struct MainFunctionParams; 77 struct MainFunctionParams;
77 struct ShowDesktopNotificationHostMsgParams; 78 struct ShowDesktopNotificationHostMsgParams;
78 79
79 typedef base::Callback< void(const content::MediaStreamDevices&) > 80 typedef base::Callback< void(const content::MediaStreamDevices&) >
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 // Adds a downloaded client cert. The embedder should ensure that there's 286 // Adds a downloaded client cert. The embedder should ensure that there's
286 // a private key for the cert, displays the cert to the user, and adds it upon 287 // a private key for the cert, displays the cert to the user, and adds it upon
287 // user approval. If the downloaded data could not be interpreted as a valid 288 // user approval. If the downloaded data could not be interpreted as a valid
288 // certificate, |cert| will be NULL. 289 // certificate, |cert| will be NULL.
289 virtual void AddNewCertificate( 290 virtual void AddNewCertificate(
290 net::URLRequest* request, 291 net::URLRequest* request,
291 net::X509Certificate* cert, 292 net::X509Certificate* cert,
292 int render_process_id, 293 int render_process_id,
293 int render_view_id) = 0; 294 int render_view_id) = 0;
294 295
296 // Returns a a class to get notifications about media event. The embedder can
297 // return NULL if they're not interested.
298 virtual MediaObserver* GetMediaObserver() = 0;
299
295 // Asks permission to use the camera and/or microphone. If permission is 300 // Asks permission to use the camera and/or microphone. If permission is
296 // granted, a call should be made to |callback| with the devices. If the 301 // granted, a call should be made to |callback| with the devices. If the
297 // request is denied, a call should be made to |callback| with an empty list 302 // request is denied, a call should be made to |callback| with an empty list
298 // of devices. |request| has the details of the request (e.g. which of audio 303 // of devices. |request| has the details of the request (e.g. which of audio
299 // and/or video devices are requested, and lists of available devices). 304 // and/or video devices are requested, and lists of available devices).
300 virtual void RequestMediaAccessPermission( 305 virtual void RequestMediaAccessPermission(
301 const content::MediaStreamRequest* request, 306 const content::MediaStreamRequest* request,
302 const MediaResponseCallback& callback) = 0; 307 const MediaResponseCallback& callback) = 0;
303 308
304 // Asks permission to show desktop notifications. 309 // Asks permission to show desktop notifications.
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 // This is called on a worker thread. 423 // This is called on a worker thread.
419 virtual 424 virtual
420 crypto::CryptoModuleBlockingPasswordDelegate* GetCryptoPasswordDelegate( 425 crypto::CryptoModuleBlockingPasswordDelegate* GetCryptoPasswordDelegate(
421 const GURL& url) = 0; 426 const GURL& url) = 0;
422 #endif 427 #endif
423 }; 428 };
424 429
425 } // namespace content 430 } // namespace content
426 431
427 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ 432 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_process_host_impl.cc ('k') | content/public/browser/media_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698