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

Side by Side Diff: chromecast/browser/cast_content_browser_client.cc

Issue 962793005: Adds MediaClientAndroid to support embedder/MediaDrmBridge interaction. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: overhaul: creates MediaClientAndroid (browser-side client), eliminates Java-based MediaDrmBridge ke… Created 5 years, 8 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "chromecast/browser/cast_content_browser_client.h" 5 #include "chromecast/browser/cast_content_browser_client.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/base_switches.h" 9 #include "base/base_switches.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 27 matching lines...) Expand all
38 #include "content/public/common/content_switches.h" 38 #include "content/public/common/content_switches.h"
39 #include "content/public/common/url_constants.h" 39 #include "content/public/common/url_constants.h"
40 #include "content/public/common/web_preferences.h" 40 #include "content/public/common/web_preferences.h"
41 #include "gin/v8_initializer.h" 41 #include "gin/v8_initializer.h"
42 #include "net/ssl/ssl_cert_request_info.h" 42 #include "net/ssl/ssl_cert_request_info.h"
43 #include "net/url_request/url_request_context_getter.h" 43 #include "net/url_request/url_request_context_getter.h"
44 #include "ui/gl/gl_switches.h" 44 #include "ui/gl/gl_switches.h"
45 45
46 #if defined(OS_ANDROID) 46 #if defined(OS_ANDROID)
47 #include "chromecast/browser/android/external_video_surface_container_impl.h" 47 #include "chromecast/browser/android/external_video_surface_container_impl.h"
48 #endif // defined(OS_ANDROID)
49
50 #if defined(OS_ANDROID)
51 #include "components/crash/browser/crash_dump_manager_android.h" 48 #include "components/crash/browser/crash_dump_manager_android.h"
52 #endif // defined(OS_ANDROID) 49 #endif // defined(OS_ANDROID)
53 50
54 namespace chromecast { 51 namespace chromecast {
55 namespace shell { 52 namespace shell {
56 53
57 CastContentBrowserClient::CastContentBrowserClient() 54 CastContentBrowserClient::CastContentBrowserClient()
58 : v8_natives_fd_(-1), 55 : v8_natives_fd_(-1),
59 v8_snapshot_fd_(-1), 56 v8_snapshot_fd_(-1),
60 url_request_context_factory_(new URLRequestContextFactory()) { 57 url_request_context_factory_(new URLRequestContextFactory()) {
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after
420 process_type, dumps_path, false /* upload */); 417 process_type, dumps_path, false /* upload */);
421 // StartUploaderThread() even though upload is diferred. 418 // StartUploaderThread() even though upload is diferred.
422 // Breakpad-related memory is freed in the uploader thread. 419 // Breakpad-related memory is freed in the uploader thread.
423 crash_handler->StartUploaderThread(); 420 crash_handler->StartUploaderThread();
424 return crash_handler; 421 return crash_handler;
425 } 422 }
426 #endif // !defined(OS_ANDROID) 423 #endif // !defined(OS_ANDROID)
427 424
428 } // namespace shell 425 } // namespace shell
429 } // namespace chromecast 426 } // namespace chromecast
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698