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

Side by Side Diff: chromecast/renderer/cast_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
« no previous file with comments | « chromecast/renderer/DEPS ('k') | components/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/renderer/cast_content_renderer_client.h" 5 #include "chromecast/renderer/cast_content_renderer_client.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 #include <string> 8 #include <string>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 11 matching lines...) Expand all
22 #include "components/network_hints/renderer/prescient_networking_dispatcher.h" 22 #include "components/network_hints/renderer/prescient_networking_dispatcher.h"
23 #include "content/grit/content_resources.h" 23 #include "content/grit/content_resources.h"
24 #include "content/public/common/content_switches.h" 24 #include "content/public/common/content_switches.h"
25 #include "content/public/renderer/render_frame.h" 25 #include "content/public/renderer/render_frame.h"
26 #include "content/public/renderer/render_thread.h" 26 #include "content/public/renderer/render_thread.h"
27 #include "content/public/renderer/render_view.h" 27 #include "content/public/renderer/render_view.h"
28 #include "gin/modules/module_registry.h" 28 #include "gin/modules/module_registry.h"
29 #include "gin/per_context_data.h" 29 #include "gin/per_context_data.h"
30 #include "gin/public/context_holder.h" 30 #include "gin/public/context_holder.h"
31 #include "media/base/media.h" 31 #include "media/base/media.h"
32 #include "services/shell/public/cpp/interface_provider.h" 32 #include "services/service_manager/public/cpp/interface_provider.h"
33 #include "third_party/WebKit/public/platform/WebColor.h" 33 #include "third_party/WebKit/public/platform/WebColor.h"
34 #include "third_party/WebKit/public/web/WebFrameWidget.h" 34 #include "third_party/WebKit/public/web/WebFrameWidget.h"
35 #include "third_party/WebKit/public/web/WebKit.h" 35 #include "third_party/WebKit/public/web/WebKit.h"
36 #include "third_party/WebKit/public/web/WebLocalFrame.h" 36 #include "third_party/WebKit/public/web/WebLocalFrame.h"
37 #include "third_party/WebKit/public/web/WebSettings.h" 37 #include "third_party/WebKit/public/web/WebSettings.h"
38 #include "third_party/WebKit/public/web/WebView.h" 38 #include "third_party/WebKit/public/web/WebView.h"
39 #include "ui/base/resource/resource_bundle.h" 39 #include "ui/base/resource/resource_bundle.h"
40 40
41 #if defined(OS_ANDROID) 41 #if defined(OS_ANDROID)
42 #include "media/base/android/media_codec_util.h" 42 #include "media/base/android/media_codec_util.h"
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 172
173 void ExecuteJavaScript(content::RenderFrame* render_frame, int resource_id) { 173 void ExecuteJavaScript(content::RenderFrame* render_frame, int resource_id) {
174 const std::string& js_string = ui::ResourceBundle::GetSharedInstance() 174 const std::string& js_string = ui::ResourceBundle::GetSharedInstance()
175 .GetRawDataResource(resource_id) 175 .GetRawDataResource(resource_id)
176 .as_string(); 176 .as_string();
177 render_frame->ExecuteJavaScript(base::UTF8ToUTF16(js_string)); 177 render_frame->ExecuteJavaScript(base::UTF8ToUTF16(js_string));
178 } 178 }
179 179
180 } // namespace shell 180 } // namespace shell
181 } // namespace chromecast 181 } // namespace chromecast
OLDNEW
« no previous file with comments | « chromecast/renderer/DEPS ('k') | components/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698