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

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

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase Created 4 years, 2 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 | « chromecast/browser/DEPS ('k') | chromecast/browser/media/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 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 #include "content/public/browser/render_process_host.h" 48 #include "content/public/browser/render_process_host.h"
49 #include "content/public/browser/resource_dispatcher_host.h" 49 #include "content/public/browser/resource_dispatcher_host.h"
50 #include "content/public/browser/web_contents.h" 50 #include "content/public/browser/web_contents.h"
51 #include "content/public/common/content_descriptors.h" 51 #include "content/public/common/content_descriptors.h"
52 #include "content/public/common/content_switches.h" 52 #include "content/public/common/content_switches.h"
53 #include "content/public/common/service_names.h" 53 #include "content/public/common/service_names.h"
54 #include "content/public/common/url_constants.h" 54 #include "content/public/common/url_constants.h"
55 #include "content/public/common/web_preferences.h" 55 #include "content/public/common/web_preferences.h"
56 #include "net/ssl/ssl_cert_request_info.h" 56 #include "net/ssl/ssl_cert_request_info.h"
57 #include "net/url_request/url_request_context_getter.h" 57 #include "net/url_request/url_request_context_getter.h"
58 #include "services/shell/public/cpp/interface_registry.h" 58 #include "services/service_manager/public/cpp/interface_registry.h"
59 #include "ui/base/resource/resource_bundle.h" 59 #include "ui/base/resource/resource_bundle.h"
60 #include "ui/display/display.h" 60 #include "ui/display/display.h"
61 #include "ui/display/screen.h" 61 #include "ui/display/screen.h"
62 #include "ui/gl/gl_switches.h" 62 #include "ui/gl/gl_switches.h"
63 63
64 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) 64 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
65 #include "chromecast/browser/media/cast_mojo_media_client.h" 65 #include "chromecast/browser/media/cast_mojo_media_client.h"
66 #include "media/mojo/services/mojo_media_application.h" // nogncheck 66 #include "media/mojo/services/mojo_media_application.h" // nogncheck
67 #endif // ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS 67 #endif // ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS
68 68
(...skipping 480 matching lines...) Expand 10 before | Expand all | Expand 10 after
549 process_type, dumps_path, false /* upload */); 549 process_type, dumps_path, false /* upload */);
550 // StartUploaderThread() even though upload is diferred. 550 // StartUploaderThread() even though upload is diferred.
551 // Breakpad-related memory is freed in the uploader thread. 551 // Breakpad-related memory is freed in the uploader thread.
552 crash_handler->StartUploaderThread(); 552 crash_handler->StartUploaderThread();
553 return crash_handler; 553 return crash_handler;
554 } 554 }
555 #endif // !defined(OS_ANDROID) 555 #endif // !defined(OS_ANDROID)
556 556
557 } // namespace shell 557 } // namespace shell
558 } // namespace chromecast 558 } // namespace chromecast
OLDNEW
« no previous file with comments | « chromecast/browser/DEPS ('k') | chromecast/browser/media/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698