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

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

Issue 1649933002: [Chromecast] Hook up mojo media pipeline. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed gn check Created 4 years, 10 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 | « content/shell/DEPS ('k') | media/mojo/DEPS » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/browser/shell_content_browser_client.h" 5 #include "content/shell/browser/shell_content_browser_client.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/base_switches.h" 10 #include "base/base_switches.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 #include "components/crash/content/app/breakpad_linux.h" 55 #include "components/crash/content/app/breakpad_linux.h"
56 #include "components/crash/content/browser/crash_handler_host_linux.h" 56 #include "components/crash/content/browser/crash_handler_host_linux.h"
57 #include "content/public/common/content_descriptors.h" 57 #include "content/public/common/content_descriptors.h"
58 #endif 58 #endif
59 59
60 #if defined(OS_WIN) 60 #if defined(OS_WIN)
61 #include "content/common/sandbox_win.h" 61 #include "content/common/sandbox_win.h"
62 #include "sandbox/win/src/sandbox.h" 62 #include "sandbox/win/src/sandbox.h"
63 #endif 63 #endif
64 64
65 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
66 #include "media/mojo/services/mojo_media_application.h"
67 #endif
68
65 namespace content { 69 namespace content {
66 70
67 namespace { 71 namespace {
68 72
69 ShellContentBrowserClient* g_browser_client; 73 ShellContentBrowserClient* g_browser_client;
70 bool g_swap_processes_for_redirect = false; 74 bool g_swap_processes_for_redirect = false;
71 75
72 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) 76 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
73 breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost( 77 breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
74 const std::string& process_type) { 78 const std::string& process_type) {
(...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
439 ShellBrowserContext* 443 ShellBrowserContext*
440 ShellContentBrowserClient::ShellBrowserContextForBrowserContext( 444 ShellContentBrowserClient::ShellBrowserContextForBrowserContext(
441 BrowserContext* content_browser_context) { 445 BrowserContext* content_browser_context) {
442 if (content_browser_context == browser_context()) 446 if (content_browser_context == browser_context())
443 return browser_context(); 447 return browser_context();
444 DCHECK_EQ(content_browser_context, off_the_record_browser_context()); 448 DCHECK_EQ(content_browser_context, off_the_record_browser_context());
445 return off_the_record_browser_context(); 449 return off_the_record_browser_context();
446 } 450 }
447 451
448 } // namespace content 452 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/DEPS ('k') | media/mojo/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698