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

Side by Side Diff: content/browser/mock_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_BROWSER_MOCK_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef CONTENT_BROWSER_MOCK_CONTENT_BROWSER_CLIENT_H_
6 #define CONTENT_BROWSER_MOCK_CONTENT_BROWSER_CLIENT_H_ 6 #define CONTENT_BROWSER_MOCK_CONTENT_BROWSER_CLIENT_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 net::SSLCertRequestInfo* cert_request_info, 106 net::SSLCertRequestInfo* cert_request_info,
107 const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE; 107 const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE;
108 virtual void AddNewCertificate( 108 virtual void AddNewCertificate(
109 net::URLRequest* request, 109 net::URLRequest* request,
110 net::X509Certificate* cert, 110 net::X509Certificate* cert,
111 int render_process_id, 111 int render_process_id,
112 int render_view_id) OVERRIDE; 112 int render_view_id) OVERRIDE;
113 virtual void RequestMediaAccessPermission( 113 virtual void RequestMediaAccessPermission(
114 const MediaStreamRequest* request, 114 const MediaStreamRequest* request,
115 const MediaResponseCallback& callback) OVERRIDE; 115 const MediaResponseCallback& callback) OVERRIDE;
116 virtual MediaObserver* GetMediaObserver() OVERRIDE;
116 virtual void RequestDesktopNotificationPermission( 117 virtual void RequestDesktopNotificationPermission(
117 const GURL& source_origin, 118 const GURL& source_origin,
118 int callback_context, 119 int callback_context,
119 int render_process_id, 120 int render_process_id,
120 int render_view_id) OVERRIDE; 121 int render_view_id) OVERRIDE;
121 virtual WebKit::WebNotificationPresenter::Permission 122 virtual WebKit::WebNotificationPresenter::Permission
122 CheckDesktopNotificationPermission( 123 CheckDesktopNotificationPermission(
123 const GURL& source_origin, 124 const GURL& source_origin,
124 ResourceContext* context, 125 ResourceContext* context,
125 int render_process_id) OVERRIDE; 126 int render_process_id) OVERRIDE;
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 private: 180 private:
180 // Temporary directory for GetDefaultDownloadDirectory. 181 // Temporary directory for GetDefaultDownloadDirectory.
181 ScopedTempDir download_dir_; 182 ScopedTempDir download_dir_;
182 183
183 DISALLOW_COPY_AND_ASSIGN(MockContentBrowserClient); 184 DISALLOW_COPY_AND_ASSIGN(MockContentBrowserClient);
184 }; 185 };
185 186
186 } // namespace content 187 } // namespace content
187 188
188 #endif // CONTENT_BROWSER_MOCK_CONTENT_BROWSER_CLIENT_H_ 189 #endif // CONTENT_BROWSER_MOCK_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/media/media_internals_proxy.cc ('k') | content/browser/mock_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698