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 504 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
515 virtual gfx::NativeViewAccessible GetParentNativeViewAccessible() OVERRIDE; | 515 virtual gfx::NativeViewAccessible GetParentNativeViewAccessible() OVERRIDE; |
516 #endif | 516 #endif |
517 | 517 |
518 // RenderFrameHostManager::Delegate ------------------------------------------ | 518 // RenderFrameHostManager::Delegate ------------------------------------------ |
519 | 519 |
520 virtual bool CreateRenderViewForRenderManager( | 520 virtual bool CreateRenderViewForRenderManager( |
521 RenderViewHost* render_view_host, | 521 RenderViewHost* render_view_host, |
522 int opener_route_id, | 522 int opener_route_id, |
523 int proxy_routing_id, | 523 int proxy_routing_id, |
524 bool for_main_frame) OVERRIDE; | 524 bool for_main_frame) OVERRIDE; |
| 525 virtual bool CreateRenderFrameForRenderManager( |
| 526 RenderFrameHost* render_frame_host, |
| 527 int parent_routing_id) OVERRIDE; |
525 virtual void BeforeUnloadFiredFromRenderManager( | 528 virtual void BeforeUnloadFiredFromRenderManager( |
526 bool proceed, const base::TimeTicks& proceed_time, | 529 bool proceed, const base::TimeTicks& proceed_time, |
527 bool* proceed_to_fire_unload) OVERRIDE; | 530 bool* proceed_to_fire_unload) OVERRIDE; |
528 virtual void RenderProcessGoneFromRenderManager( | 531 virtual void RenderProcessGoneFromRenderManager( |
529 RenderViewHost* render_view_host) OVERRIDE; | 532 RenderViewHost* render_view_host) OVERRIDE; |
530 virtual void UpdateRenderViewSizeForRenderManager() OVERRIDE; | 533 virtual void UpdateRenderViewSizeForRenderManager() OVERRIDE; |
531 virtual void CancelModalDialogsForRenderManager() OVERRIDE; | 534 virtual void CancelModalDialogsForRenderManager() OVERRIDE; |
532 virtual void NotifySwappedFromRenderManager( | 535 virtual void NotifySwappedFromRenderManager( |
533 RenderViewHost* old_host, RenderViewHost* new_host) OVERRIDE; | 536 RenderViewHost* old_host, RenderViewHost* new_host) OVERRIDE; |
534 virtual int CreateOpenerRenderViewsForRenderManager( | 537 virtual int CreateOpenerRenderViewsForRenderManager( |
(...skipping 609 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1144 | 1147 |
1145 scoped_ptr<ScreenOrientationDispatcherHost> | 1148 scoped_ptr<ScreenOrientationDispatcherHost> |
1146 screen_orientation_dispatcher_host_; | 1149 screen_orientation_dispatcher_host_; |
1147 | 1150 |
1148 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl); | 1151 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl); |
1149 }; | 1152 }; |
1150 | 1153 |
1151 } // namespace content | 1154 } // namespace content |
1152 | 1155 |
1153 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ | 1156 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ |
OLD | NEW |