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

Side by Side Diff: content/browser/renderer_host/render_view_host_impl.h

Issue 208793005: Remove JavaScript execution from RenderViewHost. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: rebase 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 virtual void DragTargetDrop(const gfx::Point& client_pt, 193 virtual void DragTargetDrop(const gfx::Point& client_pt,
194 const gfx::Point& screen_pt, 194 const gfx::Point& screen_pt,
195 int key_modifiers) OVERRIDE; 195 int key_modifiers) OVERRIDE;
196 virtual void EnableAutoResize(const gfx::Size& min_size, 196 virtual void EnableAutoResize(const gfx::Size& min_size,
197 const gfx::Size& max_size) OVERRIDE; 197 const gfx::Size& max_size) OVERRIDE;
198 virtual void DisableAutoResize(const gfx::Size& new_size) OVERRIDE; 198 virtual void DisableAutoResize(const gfx::Size& new_size) OVERRIDE;
199 virtual void EnablePreferredSizeMode() OVERRIDE; 199 virtual void EnablePreferredSizeMode() OVERRIDE;
200 virtual void ExecuteMediaPlayerActionAtLocation( 200 virtual void ExecuteMediaPlayerActionAtLocation(
201 const gfx::Point& location, 201 const gfx::Point& location,
202 const blink::WebMediaPlayerAction& action) OVERRIDE; 202 const blink::WebMediaPlayerAction& action) OVERRIDE;
203 virtual void ExecuteJavascriptInWebFrame(
204 const base::string16& frame_xpath,
205 const base::string16& jscript) OVERRIDE;
206 virtual void ExecuteJavascriptInWebFrameCallbackResult(
207 const base::string16& frame_xpath,
208 const base::string16& jscript,
209 const JavascriptResultCallback& callback) OVERRIDE;
210 virtual void ExecutePluginActionAtLocation( 203 virtual void ExecutePluginActionAtLocation(
211 const gfx::Point& location, 204 const gfx::Point& location,
212 const blink::WebPluginAction& action) OVERRIDE; 205 const blink::WebPluginAction& action) OVERRIDE;
213 virtual void ExitFullscreen() OVERRIDE; 206 virtual void ExitFullscreen() OVERRIDE;
214 virtual void FilesSelectedInChooser( 207 virtual void FilesSelectedInChooser(
215 const std::vector<ui::SelectedFileInfo>& files, 208 const std::vector<ui::SelectedFileInfo>& files,
216 FileChooserParams::Mode permissions) OVERRIDE; 209 FileChooserParams::Mode permissions) OVERRIDE;
217 virtual RenderViewHostDelegate* GetDelegate() const OVERRIDE; 210 virtual RenderViewHostDelegate* GetDelegate() const OVERRIDE;
218 virtual int GetEnabledBindings() const OVERRIDE; 211 virtual int GetEnabledBindings() const OVERRIDE;
219 virtual SiteInstance* GetSiteInstance() const OVERRIDE; 212 virtual SiteInstance* GetSiteInstance() const OVERRIDE;
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
566 const base::string16& message, 559 const base::string16& message,
567 int32 line_no, 560 int32 line_no,
568 const base::string16& source_id); 561 const base::string16& source_id);
569 void OnUpdateInspectorSetting(const std::string& key, 562 void OnUpdateInspectorSetting(const std::string& key,
570 const std::string& value); 563 const std::string& value);
571 void OnClosePageACK(); 564 void OnClosePageACK();
572 void OnAccessibilityEvents( 565 void OnAccessibilityEvents(
573 const std::vector<AccessibilityHostMsg_EventParams>& params); 566 const std::vector<AccessibilityHostMsg_EventParams>& params);
574 void OnAccessibilityLocationChanges( 567 void OnAccessibilityLocationChanges(
575 const std::vector<AccessibilityHostMsg_LocationChangeParams>& params); 568 const std::vector<AccessibilityHostMsg_LocationChangeParams>& params);
576 void OnScriptEvalResponse(int id, const base::ListValue& result);
577 void OnDidZoomURL(double zoom_level, bool remember, const GURL& url); 569 void OnDidZoomURL(double zoom_level, bool remember, const GURL& url);
578 void OnRequestDesktopNotificationPermission(const GURL& origin, 570 void OnRequestDesktopNotificationPermission(const GURL& origin,
579 int callback_id); 571 int callback_id);
580 void OnShowDesktopNotification( 572 void OnShowDesktopNotification(
581 const ShowDesktopNotificationHostMsgParams& params); 573 const ShowDesktopNotificationHostMsgParams& params);
582 void OnCancelDesktopNotification(int notification_id); 574 void OnCancelDesktopNotification(int notification_id);
583 void OnRunFileChooser(const FileChooserParams& params); 575 void OnRunFileChooser(const FileChooserParams& params);
584 void OnDidAccessInitialDocument(); 576 void OnDidAccessInitialDocument();
585 void OnFocusedNodeTouched(bool editable); 577 void OnFocusedNodeTouched(bool editable);
586 578
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
673 665
674 // Valid only when is_waiting_for_beforeunload_ack_ or 666 // Valid only when is_waiting_for_beforeunload_ack_ or
675 // IsWaitingForUnloadACK is true. This tells us if the unload request 667 // IsWaitingForUnloadACK is true. This tells us if the unload request
676 // is for closing the entire tab ( = false), or only this RenderViewHost in 668 // is for closing the entire tab ( = false), or only this RenderViewHost in
677 // the case of a cross-site transition ( = true). 669 // the case of a cross-site transition ( = true).
678 // TODO(nasko): Move to RenderFrameHost, as this is per-frame state. 670 // TODO(nasko): Move to RenderFrameHost, as this is per-frame state.
679 bool unload_ack_is_for_cross_site_transition_; 671 bool unload_ack_is_for_cross_site_transition_;
680 672
681 bool are_javascript_messages_suppressed_; 673 bool are_javascript_messages_suppressed_;
682 674
683 // The mapping of pending javascript calls created by
684 // ExecuteJavascriptInWebFrameCallbackResult and their corresponding
685 // callbacks.
686 std::map<int, JavascriptResultCallback> javascript_callbacks_;
687
688 // Accessibility callback for testing. 675 // Accessibility callback for testing.
689 base::Callback<void(ui::AXEvent)> accessibility_testing_callback_; 676 base::Callback<void(ui::AXEvent)> accessibility_testing_callback_;
690 677
691 // The most recently received accessibility tree - for testing only. 678 // The most recently received accessibility tree - for testing only.
692 scoped_ptr<ui::AXTree> ax_tree_; 679 scoped_ptr<ui::AXTree> ax_tree_;
693 680
694 // True if the render view can be shut down suddenly. 681 // True if the render view can be shut down suddenly.
695 bool sudden_termination_allowed_; 682 bool sudden_termination_allowed_;
696 683
697 // The termination status of the last render view that terminated. 684 // The termination status of the last render view that terminated.
(...skipping 23 matching lines...) Expand all
721 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl); 708 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl);
722 }; 709 };
723 710
724 #if defined(COMPILER_MSVC) 711 #if defined(COMPILER_MSVC)
725 #pragma warning(pop) 712 #pragma warning(pop)
726 #endif 713 #endif
727 714
728 } // namespace content 715 } // namespace content
729 716
730 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ 717 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_
OLDNEW
« no previous file with comments | « chrome/browser/automation/testing_automation_provider.cc ('k') | content/browser/renderer_host/render_view_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698