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

Side by Side Diff: content/shell/shell_content_browser_client.cc

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
« no previous file with comments | « content/shell/shell_content_browser_client.h ('k') | content/shell/shell_resource_context.h » ('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 #include "content/shell/shell_content_browser_client.h" 5 #include "content/shell/shell_content_browser_client.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_path.h" 8 #include "base/file_path.h"
9 #include "content/shell/shell.h" 9 #include "content/shell/shell.h"
10 #include "content/shell/shell_browser_main_parts.h" 10 #include "content/shell/shell_browser_main_parts.h"
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 net::X509Certificate* cert, 223 net::X509Certificate* cert,
224 int render_process_id, 224 int render_process_id,
225 int render_view_id) { 225 int render_view_id) {
226 } 226 }
227 227
228 void ShellContentBrowserClient::RequestMediaAccessPermission( 228 void ShellContentBrowserClient::RequestMediaAccessPermission(
229 const content::MediaStreamRequest* request, 229 const content::MediaStreamRequest* request,
230 const content::MediaResponseCallback& callback) { 230 const content::MediaResponseCallback& callback) {
231 } 231 }
232 232
233 MediaObserver* ShellContentBrowserClient::GetMediaObserver() {
234 return NULL;
235 }
236
233 void ShellContentBrowserClient::RequestDesktopNotificationPermission( 237 void ShellContentBrowserClient::RequestDesktopNotificationPermission(
234 const GURL& source_origin, 238 const GURL& source_origin,
235 int callback_context, 239 int callback_context,
236 int render_process_id, 240 int render_process_id,
237 int render_view_id) { 241 int render_view_id) {
238 } 242 }
239 243
240 WebKit::WebNotificationPresenter::Permission 244 WebKit::WebNotificationPresenter::Permission
241 ShellContentBrowserClient::CheckDesktopNotificationPermission( 245 ShellContentBrowserClient::CheckDesktopNotificationPermission(
242 const GURL& source_origin, 246 const GURL& source_origin,
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 ShellContentBrowserClient::GetCryptoPasswordDelegate(const GURL& url) { 353 ShellContentBrowserClient::GetCryptoPasswordDelegate(const GURL& url) {
350 return NULL; 354 return NULL;
351 } 355 }
352 #endif 356 #endif
353 357
354 ShellBrowserContext* ShellContentBrowserClient::browser_context() { 358 ShellBrowserContext* ShellContentBrowserClient::browser_context() {
355 return shell_browser_main_parts_->browser_context(); 359 return shell_browser_main_parts_->browser_context();
356 } 360 }
357 361
358 } // namespace content 362 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/shell_content_browser_client.h ('k') | content/shell/shell_resource_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698