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

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 1412243003: Mark RFH::AllowInjectingJavaScriptForAndroidWebView as Android only. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 | « chrome/common/chrome_isolated_world_ids.h ('k') | content/public/browser/render_frame_host.h » ('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/browser/frame_host/render_frame_host_impl.h" 5 #include "content/browser/frame_host/render_frame_host_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/containers/hash_tables.h" 9 #include "base/containers/hash_tables.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 bool RenderFrameHostImpl::IsRFHStateActive(RenderFrameHostImplState rfh_state) { 126 bool RenderFrameHostImpl::IsRFHStateActive(RenderFrameHostImplState rfh_state) {
127 return rfh_state == STATE_DEFAULT; 127 return rfh_state == STATE_DEFAULT;
128 } 128 }
129 129
130 // static 130 // static
131 RenderFrameHost* RenderFrameHost::FromID(int render_process_id, 131 RenderFrameHost* RenderFrameHost::FromID(int render_process_id,
132 int render_frame_id) { 132 int render_frame_id) {
133 return RenderFrameHostImpl::FromID(render_process_id, render_frame_id); 133 return RenderFrameHostImpl::FromID(render_process_id, render_frame_id);
134 } 134 }
135 135
136 #if defined(OS_ANDROID)
136 // static 137 // static
137 void RenderFrameHost::AllowInjectingJavaScriptForAndroidWebView() { 138 void RenderFrameHost::AllowInjectingJavaScriptForAndroidWebView() {
138 g_allow_injecting_javascript = true; 139 g_allow_injecting_javascript = true;
139 } 140 }
141 #endif
140 142
141 // static 143 // static
142 RenderFrameHostImpl* RenderFrameHostImpl::FromID(int process_id, 144 RenderFrameHostImpl* RenderFrameHostImpl::FromID(int process_id,
143 int routing_id) { 145 int routing_id) {
144 DCHECK_CURRENTLY_ON(BrowserThread::UI); 146 DCHECK_CURRENTLY_ON(BrowserThread::UI);
145 RoutingIDFrameMap* frames = g_routing_id_frame_map.Pointer(); 147 RoutingIDFrameMap* frames = g_routing_id_frame_map.Pointer();
146 RoutingIDFrameMap::iterator it = frames->find( 148 RoutingIDFrameMap::iterator it = frames->find(
147 RenderFrameHostID(process_id, routing_id)); 149 RenderFrameHostID(process_id, routing_id));
148 return it == frames->end() ? NULL : it->second; 150 return it == frames->end() ? NULL : it->second;
149 } 151 }
(...skipping 2117 matching lines...) Expand 10 before | Expand all | Expand 10 after
2267 BrowserPluginInstanceIDToAXTreeID(value))); 2269 BrowserPluginInstanceIDToAXTreeID(value)));
2268 break; 2270 break;
2269 case AX_CONTENT_INT_ATTRIBUTE_LAST: 2271 case AX_CONTENT_INT_ATTRIBUTE_LAST:
2270 NOTREACHED(); 2272 NOTREACHED();
2271 break; 2273 break;
2272 } 2274 }
2273 } 2275 }
2274 } 2276 }
2275 2277
2276 } // namespace content 2278 } // namespace content
OLDNEW
« no previous file with comments | « chrome/common/chrome_isolated_world_ids.h ('k') | content/public/browser/render_frame_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698