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

Side by Side Diff: content/renderer/render_frame_impl.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 | « content/renderer/render_frame_impl.h ('k') | content/renderer/render_thread_impl.cc » ('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 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 #include "media/blink/webencryptedmediaclient_impl.h" 150 #include "media/blink/webencryptedmediaclient_impl.h"
151 #include "media/blink/webmediaplayer_impl.h" 151 #include "media/blink/webmediaplayer_impl.h"
152 #include "media/renderers/gpu_video_accelerator_factories.h" 152 #include "media/renderers/gpu_video_accelerator_factories.h"
153 #include "mojo/edk/js/core.h" 153 #include "mojo/edk/js/core.h"
154 #include "mojo/edk/js/support.h" 154 #include "mojo/edk/js/support.h"
155 #include "net/base/data_url.h" 155 #include "net/base/data_url.h"
156 #include "net/base/net_errors.h" 156 #include "net/base/net_errors.h"
157 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" 157 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
158 #include "net/http/http_util.h" 158 #include "net/http/http_util.h"
159 #include "ppapi/features/features.h" 159 #include "ppapi/features/features.h"
160 #include "services/shell/public/cpp/interface_provider.h" 160 #include "services/service_manager/public/cpp/interface_provider.h"
161 #include "services/shell/public/cpp/interface_registry.h" 161 #include "services/service_manager/public/cpp/interface_registry.h"
162 #include "storage/common/data_element.h" 162 #include "storage/common/data_element.h"
163 #include "third_party/WebKit/public/platform/FilePathConversion.h" 163 #include "third_party/WebKit/public/platform/FilePathConversion.h"
164 #include "third_party/WebKit/public/platform/URLConversion.h" 164 #include "third_party/WebKit/public/platform/URLConversion.h"
165 #include "third_party/WebKit/public/platform/WebCachePolicy.h" 165 #include "third_party/WebKit/public/platform/WebCachePolicy.h"
166 #include "third_party/WebKit/public/platform/WebData.h" 166 #include "third_party/WebKit/public/platform/WebData.h"
167 #include "third_party/WebKit/public/platform/WebMediaPlayer.h" 167 #include "third_party/WebKit/public/platform/WebMediaPlayer.h"
168 #include "third_party/WebKit/public/platform/WebMediaPlayerSource.h" 168 #include "third_party/WebKit/public/platform/WebMediaPlayerSource.h"
169 #include "third_party/WebKit/public/platform/WebPoint.h" 169 #include "third_party/WebKit/public/platform/WebPoint.h"
170 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h" 170 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
171 #include "third_party/WebKit/public/platform/WebStorageQuotaCallbacks.h" 171 #include "third_party/WebKit/public/platform/WebStorageQuotaCallbacks.h"
(...skipping 6376 matching lines...) Expand 10 before | Expand all | Expand 10 after
6548 // event target. Potentially a Pepper plugin will receive the event. 6548 // event target. Potentially a Pepper plugin will receive the event.
6549 // In order to tell whether a plugin gets the last mouse event and which it 6549 // In order to tell whether a plugin gets the last mouse event and which it
6550 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6550 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6551 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6551 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6552 // |pepper_last_mouse_event_target_|. 6552 // |pepper_last_mouse_event_target_|.
6553 pepper_last_mouse_event_target_ = nullptr; 6553 pepper_last_mouse_event_target_ = nullptr;
6554 #endif 6554 #endif
6555 } 6555 }
6556 6556
6557 } // namespace content 6557 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/renderer/render_thread_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698