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

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

Issue 404613005: Start using RenderFrameProxyHost objects. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Compile fix Created 6 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 | Annotate | Revision Log
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 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 virtual bool AccessibilityViewHasFocus() const OVERRIDE; 97 virtual bool AccessibilityViewHasFocus() const OVERRIDE;
98 virtual gfx::Rect AccessibilityGetViewBounds() const OVERRIDE; 98 virtual gfx::Rect AccessibilityGetViewBounds() const OVERRIDE;
99 virtual gfx::Point AccessibilityOriginInScreen(const gfx::Rect& bounds) 99 virtual gfx::Point AccessibilityOriginInScreen(const gfx::Rect& bounds)
100 const OVERRIDE; 100 const OVERRIDE;
101 virtual void AccessibilityHitTest(const gfx::Point& point) OVERRIDE; 101 virtual void AccessibilityHitTest(const gfx::Point& point) OVERRIDE;
102 virtual void AccessibilityFatalError() OVERRIDE; 102 virtual void AccessibilityFatalError() OVERRIDE;
103 virtual gfx::AcceleratedWidget AccessibilityGetAcceleratedWidget() OVERRIDE; 103 virtual gfx::AcceleratedWidget AccessibilityGetAcceleratedWidget() OVERRIDE;
104 virtual gfx::NativeViewAccessible AccessibilityGetNativeViewAccessible() 104 virtual gfx::NativeViewAccessible AccessibilityGetNativeViewAccessible()
105 OVERRIDE; 105 OVERRIDE;
106 106
107 bool CreateRenderFrame(int parent_routing_id);
108 bool IsRenderFrameLive();
107 void Init(); 109 void Init();
108 int routing_id() const { return routing_id_; } 110 int routing_id() const { return routing_id_; }
109 void OnCreateChildFrame(int new_routing_id, 111 void OnCreateChildFrame(int new_routing_id,
110 const std::string& frame_name); 112 const std::string& frame_name);
111 113
112 RenderViewHostImpl* render_view_host() { return render_view_host_; } 114 RenderViewHostImpl* render_view_host() { return render_view_host_; }
113 RenderFrameHostDelegate* delegate() { return delegate_; } 115 RenderFrameHostDelegate* delegate() { return delegate_; }
114 FrameTreeNode* frame_tree_node() { return frame_tree_node_; } 116 FrameTreeNode* frame_tree_node() { return frame_tree_node_; }
115 // TODO(nasko): The RenderWidgetHost will be owned by RenderFrameHost in 117 // TODO(nasko): The RenderWidgetHost will be owned by RenderFrameHost in
116 // the future, so update this accessor to return the right pointer. 118 // the future, so update this accessor to return the right pointer.
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 363
362 // The mapping of pending JavaScript calls created by 364 // The mapping of pending JavaScript calls created by
363 // ExecuteJavaScript and their corresponding callbacks. 365 // ExecuteJavaScript and their corresponding callbacks.
364 std::map<int, JavaScriptResultCallback> javascript_callbacks_; 366 std::map<int, JavaScriptResultCallback> javascript_callbacks_;
365 367
366 // Map from notification_id to a callback to cancel them. 368 // Map from notification_id to a callback to cancel them.
367 std::map<int, base::Closure> cancel_notification_callbacks_; 369 std::map<int, base::Closure> cancel_notification_callbacks_;
368 370
369 int routing_id_; 371 int routing_id_;
370 bool is_swapped_out_; 372 bool is_swapped_out_;
373 bool renderer_initialized_;
371 374
372 // When the last BeforeUnload message was sent. 375 // When the last BeforeUnload message was sent.
373 base::TimeTicks send_before_unload_start_time_; 376 base::TimeTicks send_before_unload_start_time_;
374 377
375 ServiceRegistryImpl service_registry_; 378 ServiceRegistryImpl service_registry_;
376 379
377 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_; 380 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_;
378 381
379 scoped_ptr<BrowserAccessibilityManager> browser_accessibility_manager_; 382 scoped_ptr<BrowserAccessibilityManager> browser_accessibility_manager_;
380 383
381 // Callback when an event is received, for testing. 384 // Callback when an event is received, for testing.
382 base::Callback<void(ui::AXEvent, int)> accessibility_testing_callback_; 385 base::Callback<void(ui::AXEvent, int)> accessibility_testing_callback_;
383 // The most recently received accessibility tree - for testing only. 386 // The most recently received accessibility tree - for testing only.
384 scoped_ptr<ui::AXTree> ax_tree_for_testing_; 387 scoped_ptr<ui::AXTree> ax_tree_for_testing_;
385 388
386 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl); 389 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl);
387 }; 390 };
388 391
389 } // namespace content 392 } // namespace content
390 393
391 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 394 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698