| OLD | NEW |
| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 #include "content/public/browser/resource_dispatcher_host.h" | 50 #include "content/public/browser/resource_dispatcher_host.h" |
| 51 #include "content/public/browser/storage_partition.h" | 51 #include "content/public/browser/storage_partition.h" |
| 52 #include "content/public/browser/web_contents.h" | 52 #include "content/public/browser/web_contents.h" |
| 53 #include "content/public/common/content_descriptors.h" | 53 #include "content/public/common/content_descriptors.h" |
| 54 #include "content/public/common/content_switches.h" | 54 #include "content/public/common/content_switches.h" |
| 55 #include "content/public/common/service_names.mojom.h" | 55 #include "content/public/common/service_names.mojom.h" |
| 56 #include "content/public/common/url_constants.h" | 56 #include "content/public/common/url_constants.h" |
| 57 #include "content/public/common/web_preferences.h" | 57 #include "content/public/common/web_preferences.h" |
| 58 #include "net/ssl/ssl_cert_request_info.h" | 58 #include "net/ssl/ssl_cert_request_info.h" |
| 59 #include "net/url_request/url_request_context_getter.h" | 59 #include "net/url_request/url_request_context_getter.h" |
| 60 #include "services/service_manager/public/cpp/bind_source_info.h" |
| 60 #include "services/service_manager/public/cpp/binder_registry.h" | 61 #include "services/service_manager/public/cpp/binder_registry.h" |
| 61 #include "ui/base/resource/resource_bundle.h" | 62 #include "ui/base/resource/resource_bundle.h" |
| 62 #include "ui/display/display.h" | 63 #include "ui/display/display.h" |
| 63 #include "ui/display/screen.h" | 64 #include "ui/display/screen.h" |
| 64 #include "ui/gl/gl_switches.h" | 65 #include "ui/gl/gl_switches.h" |
| 65 | 66 |
| 66 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) | 67 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) |
| 67 #include "chromecast/media/service/cast_mojo_media_client.h" | 68 #include "chromecast/media/service/cast_mojo_media_client.h" |
| 68 #include "media/mojo/services/media_service.h" // nogncheck | 69 #include "media/mojo/services/media_service.h" // nogncheck |
| 69 #endif // ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS | 70 #endif // ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS |
| (...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 568 process_type, dumps_path, false /* upload */); | 569 process_type, dumps_path, false /* upload */); |
| 569 // StartUploaderThread() even though upload is diferred. | 570 // StartUploaderThread() even though upload is diferred. |
| 570 // Breakpad-related memory is freed in the uploader thread. | 571 // Breakpad-related memory is freed in the uploader thread. |
| 571 crash_handler->StartUploaderThread(); | 572 crash_handler->StartUploaderThread(); |
| 572 return crash_handler; | 573 return crash_handler; |
| 573 } | 574 } |
| 574 #endif // !defined(OS_ANDROID) | 575 #endif // !defined(OS_ANDROID) |
| 575 | 576 |
| 576 } // namespace shell | 577 } // namespace shell |
| 577 } // namespace chromecast | 578 } // namespace chromecast |
| OLD | NEW |