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

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

Issue 231793004: Update a few more references to WebFrame to use WebLocalFrame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase again Created 6 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « content/renderer/stats_collection_controller.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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/web_ui_extension.h" 5 #include "content/renderer/web_ui_extension.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "content/common/view_messages.h" 9 #include "content/common/view_messages.h"
10 #include "content/public/common/bindings_policy.h" 10 #include "content/public/common/bindings_policy.h"
11 #include "content/public/common/url_constants.h" 11 #include "content/public/common/url_constants.h"
12 #include "content/public/renderer/render_thread.h" 12 #include "content/public/renderer/render_thread.h"
13 #include "content/public/renderer/render_view.h" 13 #include "content/public/renderer/render_view.h"
14 #include "content/public/renderer/v8_value_converter.h" 14 #include "content/public/renderer/v8_value_converter.h"
15 #include "content/renderer/web_ui_extension_data.h" 15 #include "content/renderer/web_ui_extension_data.h"
16 #include "gin/arguments.h" 16 #include "gin/arguments.h"
17 #include "gin/function_template.h" 17 #include "gin/function_template.h"
18 #include "third_party/WebKit/public/web/WebDocument.h" 18 #include "third_party/WebKit/public/web/WebDocument.h"
19 #include "third_party/WebKit/public/web/WebFrame.h"
20 #include "third_party/WebKit/public/web/WebKit.h" 19 #include "third_party/WebKit/public/web/WebKit.h"
20 #include "third_party/WebKit/public/web/WebLocalFrame.h"
21 #include "third_party/WebKit/public/web/WebView.h" 21 #include "third_party/WebKit/public/web/WebView.h"
22 #include "url/gurl.h" 22 #include "url/gurl.h"
23 #include "v8/include/v8.h" 23 #include "v8/include/v8.h"
24 24
25 namespace content { 25 namespace content {
26 26
27 namespace { 27 namespace {
28 28
29 bool ShouldRespondToRequest( 29 bool ShouldRespondToRequest(
30 blink::WebFrame** frame_ptr, 30 blink::WebFrame** frame_ptr,
31 RenderView** render_view_ptr) { 31 RenderView** render_view_ptr) {
32 blink::WebFrame* frame = blink::WebFrame::frameForCurrentContext(); 32 blink::WebFrame* frame = blink::WebLocalFrame::frameForCurrentContext();
33 if (!frame || !frame->view()) 33 if (!frame || !frame->view())
34 return false; 34 return false;
35 35
36 RenderView* render_view = RenderView::FromWebView(frame->view()); 36 RenderView* render_view = RenderView::FromWebView(frame->view());
37 if (!render_view) 37 if (!render_view)
38 return false; 38 return false;
39 39
40 GURL frame_url = frame->document().url(); 40 GURL frame_url = frame->document().url();
41 41
42 bool webui_enabled = 42 bool webui_enabled =
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 std::string WebUIExtension::GetVariableValue(const std::string& name) { 131 std::string WebUIExtension::GetVariableValue(const std::string& name) {
132 blink::WebFrame* frame; 132 blink::WebFrame* frame;
133 RenderView* render_view; 133 RenderView* render_view;
134 if (!ShouldRespondToRequest(&frame, &render_view)) 134 if (!ShouldRespondToRequest(&frame, &render_view))
135 return std::string(); 135 return std::string();
136 136
137 return WebUIExtensionData::Get(render_view)->GetValue(name); 137 return WebUIExtensionData::Get(render_view)->GetValue(name);
138 } 138 }
139 139
140 } // namespace content 140 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/stats_collection_controller.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698