| 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_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 566 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 577 // TODO(nasko): Move to RenderFrameHost, as this is per-frame state. | 577 // TODO(nasko): Move to RenderFrameHost, as this is per-frame state. |
| 578 bool navigations_suspended_; | 578 bool navigations_suspended_; |
| 579 | 579 |
| 580 // We only buffer the params for a suspended navigation while we have a | 580 // We only buffer the params for a suspended navigation while we have a |
| 581 // pending RVH for a WebContentsImpl. There will only ever be one suspended | 581 // pending RVH for a WebContentsImpl. There will only ever be one suspended |
| 582 // navigation, because WebContentsImpl will destroy the pending RVH and create | 582 // navigation, because WebContentsImpl will destroy the pending RVH and create |
| 583 // a new one if a second navigation occurs. | 583 // a new one if a second navigation occurs. |
| 584 // TODO(nasko): Move to RenderFrameHost, as this is per-frame state. | 584 // TODO(nasko): Move to RenderFrameHost, as this is per-frame state. |
| 585 scoped_ptr<FrameMsg_Navigate_Params> suspended_nav_params_; | 585 scoped_ptr<FrameMsg_Navigate_Params> suspended_nav_params_; |
| 586 | 586 |
| 587 // The most recent page ID we've heard from the renderer process. This is |
| 588 // used as context when other session history related IPCs arrive. |
| 589 // TODO(creis): Allocate this in the browser process instead. |
| 590 int32 page_id_; |
| 591 |
| 587 // The current state of this RVH. | 592 // The current state of this RVH. |
| 588 // TODO(nasko): Move to RenderFrameHost, as this is per-frame state. | 593 // TODO(nasko): Move to RenderFrameHost, as this is per-frame state. |
| 589 RenderViewHostImplState rvh_state_; | 594 RenderViewHostImplState rvh_state_; |
| 590 | 595 |
| 591 // Routing ID for the main frame's RenderFrameHost. | 596 // Routing ID for the main frame's RenderFrameHost. |
| 592 int main_frame_routing_id_; | 597 int main_frame_routing_id_; |
| 593 | 598 |
| 594 // If we were asked to RunModal, then this will hold the reply_msg that we | 599 // If we were asked to RunModal, then this will hold the reply_msg that we |
| 595 // must return to the renderer to unblock it. | 600 // must return to the renderer to unblock it. |
| 596 IPC::Message* run_modal_reply_msg_; | 601 IPC::Message* run_modal_reply_msg_; |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 650 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl); | 655 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl); |
| 651 }; | 656 }; |
| 652 | 657 |
| 653 #if defined(COMPILER_MSVC) | 658 #if defined(COMPILER_MSVC) |
| 654 #pragma warning(pop) | 659 #pragma warning(pop) |
| 655 #endif | 660 #endif |
| 656 | 661 |
| 657 } // namespace content | 662 } // namespace content |
| 658 | 663 |
| 659 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ | 664 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ |
| OLD | NEW |