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

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

Issue 2154233003: Rewrite YouTube Flash embeds (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed comments Created 4 years, 4 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 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 1051 matching lines...) Expand 10 before | Expand all | Expand 10 after
1062 RenderFrameImpl::FromRoutingID(opener_frame_routing_id); 1062 RenderFrameImpl::FromRoutingID(opener_frame_routing_id);
1063 if (opener_frame) { 1063 if (opener_frame) {
1064 if (opener_view_routing_id) 1064 if (opener_view_routing_id)
1065 *opener_view_routing_id = opener_frame->render_view()->GetRoutingID(); 1065 *opener_view_routing_id = opener_frame->render_view()->GetRoutingID();
1066 return opener_frame->GetWebFrame(); 1066 return opener_frame->GetWebFrame();
1067 } 1067 }
1068 1068
1069 return nullptr; 1069 return nullptr;
1070 } 1070 }
1071 1071
1072 blink::WebString RenderFrameImpl::overrideFlashEmbedWithHTML(
1073 const WebString& url) {
1074 return blink::WebString::fromUTF8(
1075 GetContentClient()->renderer()->OverrideFlashEmbedWithHTML(url.utf8()));
1076 }
1077
1072 // RenderFrameImpl ---------------------------------------------------------- 1078 // RenderFrameImpl ----------------------------------------------------------
1073 RenderFrameImpl::RenderFrameImpl(const CreateParams& params) 1079 RenderFrameImpl::RenderFrameImpl(const CreateParams& params)
1074 : frame_(NULL), 1080 : frame_(NULL),
1075 is_main_frame_(true), 1081 is_main_frame_(true),
1076 in_browser_initiated_detach_(false), 1082 in_browser_initiated_detach_(false),
1077 in_frame_tree_(false), 1083 in_frame_tree_(false),
1078 render_view_(params.render_view->AsWeakPtr()), 1084 render_view_(params.render_view->AsWeakPtr()),
1079 routing_id_(params.routing_id), 1085 routing_id_(params.routing_id),
1080 proxy_routing_id_(MSG_ROUTING_NONE), 1086 proxy_routing_id_(MSG_ROUTING_NONE),
1081 #if defined(ENABLE_PLUGINS) 1087 #if defined(ENABLE_PLUGINS)
(...skipping 5264 matching lines...) Expand 10 before | Expand all | Expand 10 after
6346 // event target. Potentially a Pepper plugin will receive the event. 6352 // event target. Potentially a Pepper plugin will receive the event.
6347 // In order to tell whether a plugin gets the last mouse event and which it 6353 // In order to tell whether a plugin gets the last mouse event and which it
6348 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6354 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6349 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6355 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6350 // |pepper_last_mouse_event_target_|. 6356 // |pepper_last_mouse_event_target_|.
6351 pepper_last_mouse_event_target_ = nullptr; 6357 pepper_last_mouse_event_target_ = nullptr;
6352 #endif 6358 #endif
6353 } 6359 }
6354 6360
6355 } // namespace content 6361 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698