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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 703273002: Update mojo sdk to rev 04a510fb37db10642e156957f9b2c11c2f6442ac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix content/child -> mojo/common linking Created 6 years, 1 month 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 | « content/renderer/mojo/service_registry_js_wrapper.cc ('k') | content/test/data/web_ui_mojo.js » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 #include "content/renderer/screen_orientation/screen_orientation_dispatcher.h" 94 #include "content/renderer/screen_orientation/screen_orientation_dispatcher.h"
95 #include "content/renderer/shared_worker_repository.h" 95 #include "content/renderer/shared_worker_repository.h"
96 #include "content/renderer/v8_value_converter_impl.h" 96 #include "content/renderer/v8_value_converter_impl.h"
97 #include "content/renderer/websharedworker_proxy.h" 97 #include "content/renderer/websharedworker_proxy.h"
98 #include "gin/modules/module_registry.h" 98 #include "gin/modules/module_registry.h"
99 #include "media/base/audio_renderer_mixer_input.h" 99 #include "media/base/audio_renderer_mixer_input.h"
100 #include "media/base/renderer.h" 100 #include "media/base/renderer.h"
101 #include "media/blink/webmediaplayer_impl.h" 101 #include "media/blink/webmediaplayer_impl.h"
102 #include "media/blink/webmediaplayer_params.h" 102 #include "media/blink/webmediaplayer_params.h"
103 #include "media/filters/gpu_video_accelerator_factories.h" 103 #include "media/filters/gpu_video_accelerator_factories.h"
104 #include "mojo/bindings/js/core.h" 104 #include "mojo/edk/js/core.h"
105 #include "mojo/bindings/js/support.h" 105 #include "mojo/edk/js/support.h"
106 #include "net/base/data_url.h" 106 #include "net/base/data_url.h"
107 #include "net/base/net_errors.h" 107 #include "net/base/net_errors.h"
108 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" 108 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
109 #include "net/http/http_util.h" 109 #include "net/http/http_util.h"
110 #include "third_party/WebKit/public/platform/WebStorageQuotaCallbacks.h" 110 #include "third_party/WebKit/public/platform/WebStorageQuotaCallbacks.h"
111 #include "third_party/WebKit/public/platform/WebString.h" 111 #include "third_party/WebKit/public/platform/WebString.h"
112 #include "third_party/WebKit/public/platform/WebURL.h" 112 #include "third_party/WebKit/public/platform/WebURL.h"
113 #include "third_party/WebKit/public/platform/WebURLError.h" 113 #include "third_party/WebKit/public/platform/WebURLError.h"
114 #include "third_party/WebKit/public/platform/WebURLResponse.h" 114 #include "third_party/WebKit/public/platform/WebURLResponse.h"
115 #include "third_party/WebKit/public/platform/WebVector.h" 115 #include "third_party/WebKit/public/platform/WebVector.h"
(...skipping 4063 matching lines...) Expand 10 before | Expand all | Expand 10 after
4179 4179
4180 #if defined(ENABLE_BROWSER_CDMS) 4180 #if defined(ENABLE_BROWSER_CDMS)
4181 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 4181 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
4182 if (!cdm_manager_) 4182 if (!cdm_manager_)
4183 cdm_manager_ = new RendererCdmManager(this); 4183 cdm_manager_ = new RendererCdmManager(this);
4184 return cdm_manager_; 4184 return cdm_manager_;
4185 } 4185 }
4186 #endif // defined(ENABLE_BROWSER_CDMS) 4186 #endif // defined(ENABLE_BROWSER_CDMS)
4187 4187
4188 } // namespace content 4188 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/mojo/service_registry_js_wrapper.cc ('k') | content/test/data/web_ui_mojo.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698