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

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

Issue 1968833002: media: Make media mojo services a component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase only Created 4 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 | « content/shell/BUILD.gn ('k') | content/utility/BUILD.gn » ('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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 #include "components/crash/content/browser/crash_handler_host_linux.h" 53 #include "components/crash/content/browser/crash_handler_host_linux.h"
54 #include "content/public/common/content_descriptors.h" 54 #include "content/public/common/content_descriptors.h"
55 #endif 55 #endif
56 56
57 #if defined(OS_WIN) 57 #if defined(OS_WIN)
58 #include "content/common/sandbox_win.h" 58 #include "content/common/sandbox_win.h"
59 #include "sandbox/win/src/sandbox.h" 59 #include "sandbox/win/src/sandbox.h"
60 #endif 60 #endif
61 61
62 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) 62 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
63 #include "media/mojo/services/mojo_media_application_factory.h" 63 #include "media/mojo/services/mojo_media_application_factory.h" // nogncheck
64 #endif 64 #endif
65 65
66 namespace content { 66 namespace content {
67 67
68 namespace { 68 namespace {
69 69
70 ShellContentBrowserClient* g_browser_client; 70 ShellContentBrowserClient* g_browser_client;
71 bool g_swap_processes_for_redirect = false; 71 bool g_swap_processes_for_redirect = false;
72 72
73 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) 73 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
351 ShellBrowserContext* 351 ShellBrowserContext*
352 ShellContentBrowserClient::off_the_record_browser_context() { 352 ShellContentBrowserClient::off_the_record_browser_context() {
353 return shell_browser_main_parts_->off_the_record_browser_context(); 353 return shell_browser_main_parts_->off_the_record_browser_context();
354 } 354 }
355 355
356 AccessTokenStore* ShellContentBrowserClient::CreateAccessTokenStore() { 356 AccessTokenStore* ShellContentBrowserClient::CreateAccessTokenStore() {
357 return new ShellAccessTokenStore(browser_context()); 357 return new ShellAccessTokenStore(browser_context());
358 } 358 }
359 359
360 } // namespace content 360 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/BUILD.gn ('k') | content/utility/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698