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

Side by Side Diff: content/shell/renderer/shell_content_renderer_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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/renderer/shell_content_renderer_client.h" 5 #include "content/shell/renderer/shell_content_renderer_client.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "components/cdm/renderer/external_clear_key_key_system_properties.h" 13 #include "components/cdm/renderer/external_clear_key_key_system_properties.h"
14 #include "components/web_cache/renderer/web_cache_impl.h" 14 #include "components/web_cache/renderer/web_cache_impl.h"
15 #include "content/public/test/test_service.mojom.h" 15 #include "content/public/test/test_service.mojom.h"
16 #include "content/shell/common/shell_switches.h" 16 #include "content/shell/common/shell_switches.h"
17 #include "content/shell/renderer/shell_render_view_observer.h" 17 #include "content/shell/renderer/shell_render_view_observer.h"
18 #include "mojo/public/cpp/bindings/binding.h" 18 #include "mojo/public/cpp/bindings/binding.h"
19 #include "mojo/public/cpp/system/message_pipe.h" 19 #include "mojo/public/cpp/system/message_pipe.h"
20 #include "services/shell/public/cpp/interface_registry.h" 20 #include "services/service_manager/public/cpp/interface_registry.h"
21 #include "third_party/WebKit/public/web/WebTestingSupport.h" 21 #include "third_party/WebKit/public/web/WebTestingSupport.h"
22 #include "third_party/WebKit/public/web/WebView.h" 22 #include "third_party/WebKit/public/web/WebView.h"
23 #include "v8/include/v8.h" 23 #include "v8/include/v8.h"
24 24
25 #if defined(ENABLE_PLUGINS) 25 #if defined(ENABLE_PLUGINS)
26 #include "ppapi/shared_impl/ppapi_switches.h" 26 #include "ppapi/shared_impl/ppapi_switches.h"
27 #endif 27 #endif
28 28
29 #if defined(OS_ANDROID) 29 #if defined(OS_ANDROID)
30 #include "base/feature_list.h" 30 #include "base/feature_list.h"
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 return; 147 return;
148 148
149 static const char kExternalClearKeyKeySystem[] = 149 static const char kExternalClearKeyKeySystem[] =
150 "org.chromium.externalclearkey"; 150 "org.chromium.externalclearkey";
151 key_systems->emplace_back( 151 key_systems->emplace_back(
152 new cdm::ExternalClearKeyProperties(kExternalClearKeyKeySystem)); 152 new cdm::ExternalClearKeyProperties(kExternalClearKeyKeySystem));
153 } 153 }
154 #endif 154 #endif
155 155
156 } // namespace content 156 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/renderer/layout_test/interface_registry_js_wrapper.cc ('k') | content/shell/utility/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698