OLD | NEW |
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_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ | 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ |
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ | 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
9 #include <set> | 9 #include <set> |
10 #include <string> | 10 #include <string> |
(...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
513 virtual gfx::NativeViewAccessible GetParentNativeViewAccessible() OVERRIDE; | 513 virtual gfx::NativeViewAccessible GetParentNativeViewAccessible() OVERRIDE; |
514 #endif | 514 #endif |
515 | 515 |
516 // RenderFrameHostManager::Delegate ------------------------------------------ | 516 // RenderFrameHostManager::Delegate ------------------------------------------ |
517 | 517 |
518 virtual bool CreateRenderViewForRenderManager( | 518 virtual bool CreateRenderViewForRenderManager( |
519 RenderViewHost* render_view_host, | 519 RenderViewHost* render_view_host, |
520 int opener_route_id, | 520 int opener_route_id, |
521 int proxy_routing_id, | 521 int proxy_routing_id, |
522 bool for_main_frame) OVERRIDE; | 522 bool for_main_frame) OVERRIDE; |
| 523 virtual bool CreateRenderFrameForRenderManager( |
| 524 RenderFrameHost* render_frame_host, |
| 525 int parent_routing_id) OVERRIDE; |
523 virtual void BeforeUnloadFiredFromRenderManager( | 526 virtual void BeforeUnloadFiredFromRenderManager( |
524 bool proceed, const base::TimeTicks& proceed_time, | 527 bool proceed, const base::TimeTicks& proceed_time, |
525 bool* proceed_to_fire_unload) OVERRIDE; | 528 bool* proceed_to_fire_unload) OVERRIDE; |
526 virtual void RenderProcessGoneFromRenderManager( | 529 virtual void RenderProcessGoneFromRenderManager( |
527 RenderViewHost* render_view_host) OVERRIDE; | 530 RenderViewHost* render_view_host) OVERRIDE; |
528 virtual void UpdateRenderViewSizeForRenderManager() OVERRIDE; | 531 virtual void UpdateRenderViewSizeForRenderManager() OVERRIDE; |
529 virtual void CancelModalDialogsForRenderManager() OVERRIDE; | 532 virtual void CancelModalDialogsForRenderManager() OVERRIDE; |
530 virtual void NotifySwappedFromRenderManager(RenderFrameHost* old_host, | 533 virtual void NotifySwappedFromRenderManager(RenderFrameHost* old_host, |
531 RenderFrameHost* new_host, | 534 RenderFrameHost* new_host, |
532 bool is_main_frame) OVERRIDE; | 535 bool is_main_frame) OVERRIDE; |
(...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1153 | 1156 |
1154 scoped_ptr<ScreenOrientationDispatcherHost> | 1157 scoped_ptr<ScreenOrientationDispatcherHost> |
1155 screen_orientation_dispatcher_host_; | 1158 screen_orientation_dispatcher_host_; |
1156 | 1159 |
1157 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl); | 1160 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl); |
1158 }; | 1161 }; |
1159 | 1162 |
1160 } // namespace content | 1163 } // namespace content |
1161 | 1164 |
1162 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ | 1165 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ |
OLD | NEW |