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

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

Issue 1682363002: Remove //device/devices_app. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove two files that somehow survived in //device/devices_app. Created 4 years, 10 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/DEPS ('k') | content/renderer/usb/DEPS » ('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 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 #include "content/renderer/java/gin_java_bridge_dispatcher.h" 202 #include "content/renderer/java/gin_java_bridge_dispatcher.h"
203 #include "content/renderer/media/android/renderer_media_player_manager.h" 203 #include "content/renderer/media/android/renderer_media_player_manager.h"
204 #include "content/renderer/media/android/renderer_media_session_manager.h" 204 #include "content/renderer/media/android/renderer_media_session_manager.h"
205 #include "content/renderer/media/android/stream_texture_factory_impl.h" 205 #include "content/renderer/media/android/stream_texture_factory_impl.h"
206 #include "content/renderer/media/android/webmediaplayer_android.h" 206 #include "content/renderer/media/android/webmediaplayer_android.h"
207 #include "content/renderer/media/android/webmediasession_android.h" 207 #include "content/renderer/media/android/webmediasession_android.h"
208 #include "media/base/android/media_codec_util.h" 208 #include "media/base/android/media_codec_util.h"
209 #include "third_party/WebKit/public/platform/WebFloatPoint.h" 209 #include "third_party/WebKit/public/platform/WebFloatPoint.h"
210 #else 210 #else
211 #include "cc/blink/context_provider_web_context.h" 211 #include "cc/blink/context_provider_web_context.h"
212 #include "device/devices_app/public/cpp/constants.h"
213 #endif 212 #endif
214 213
215 #if defined(ENABLE_PEPPER_CDMS) 214 #if defined(ENABLE_PEPPER_CDMS)
216 #include "content/renderer/media/cdm/pepper_cdm_wrapper_impl.h" 215 #include "content/renderer/media/cdm/pepper_cdm_wrapper_impl.h"
217 #elif defined(ENABLE_BROWSER_CDMS) 216 #elif defined(ENABLE_BROWSER_CDMS)
218 #include "content/renderer/media/cdm/renderer_cdm_manager.h" 217 #include "content/renderer/media/cdm/renderer_cdm_manager.h"
219 #endif 218 #endif
220 219
221 #if defined(ENABLE_MOJO_MEDIA) 220 #if defined(ENABLE_MOJO_MEDIA)
222 #include "media/mojo/services/mojo_cdm_factory.h" // nogncheck 221 #include "media/mojo/services/mojo_cdm_factory.h" // nogncheck
(...skipping 5909 matching lines...) Expand 10 before | Expand all | Expand 10 after
6132 int match_count, 6131 int match_count,
6133 int ordinal, 6132 int ordinal,
6134 const WebRect& selection_rect, 6133 const WebRect& selection_rect,
6135 bool final_status_update) { 6134 bool final_status_update) {
6136 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, 6135 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count,
6137 selection_rect, ordinal, 6136 selection_rect, ordinal,
6138 final_status_update)); 6137 final_status_update));
6139 } 6138 }
6140 6139
6141 } // namespace content 6140 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/DEPS ('k') | content/renderer/usb/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698