| 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 529 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 540 // TODO(nasko): Move to RenderFrameHost, as this is per-frame state. | 540 // TODO(nasko): Move to RenderFrameHost, as this is per-frame state. |
| 541 bool navigations_suspended_; | 541 bool navigations_suspended_; |
| 542 | 542 |
| 543 // We only buffer the params for a suspended navigation while we have a | 543 // We only buffer the params for a suspended navigation while we have a |
| 544 // pending RVH for a WebContentsImpl. There will only ever be one suspended | 544 // pending RVH for a WebContentsImpl. There will only ever be one suspended |
| 545 // navigation, because WebContentsImpl will destroy the pending RVH and create | 545 // navigation, because WebContentsImpl will destroy the pending RVH and create |
| 546 // a new one if a second navigation occurs. | 546 // a new one if a second navigation occurs. |
| 547 // TODO(nasko): Move to RenderFrameHost, as this is per-frame state. | 547 // TODO(nasko): Move to RenderFrameHost, as this is per-frame state. |
| 548 scoped_ptr<FrameMsg_Navigate_Params> suspended_nav_params_; | 548 scoped_ptr<FrameMsg_Navigate_Params> suspended_nav_params_; |
| 549 | 549 |
| 550 // The most recent page ID we've heard from the renderer process. This is |
| 551 // used as context when other session history related IPCs arrive. |
| 552 // TODO(creis): Allocate this in WebContents/NavigationController instead. |
| 553 int32 page_id_; |
| 554 |
| 550 // The current state of this RVH. | 555 // The current state of this RVH. |
| 551 // TODO(nasko): Move to RenderFrameHost, as this is per-frame state. | 556 // TODO(nasko): Move to RenderFrameHost, as this is per-frame state. |
| 552 RenderViewHostImplState rvh_state_; | 557 RenderViewHostImplState rvh_state_; |
| 553 | 558 |
| 554 // Routing ID for the main frame's RenderFrameHost. | 559 // Routing ID for the main frame's RenderFrameHost. |
| 555 int main_frame_routing_id_; | 560 int main_frame_routing_id_; |
| 556 | 561 |
| 557 // If we were asked to RunModal, then this will hold the reply_msg that we | 562 // If we were asked to RunModal, then this will hold the reply_msg that we |
| 558 // must return to the renderer to unblock it. | 563 // must return to the renderer to unblock it. |
| 559 IPC::Message* run_modal_reply_msg_; | 564 IPC::Message* run_modal_reply_msg_; |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 610 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl); | 615 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl); |
| 611 }; | 616 }; |
| 612 | 617 |
| 613 #if defined(COMPILER_MSVC) | 618 #if defined(COMPILER_MSVC) |
| 614 #pragma warning(pop) | 619 #pragma warning(pop) |
| 615 #endif | 620 #endif |
| 616 | 621 |
| 617 } // namespace content | 622 } // namespace content |
| 618 | 623 |
| 619 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ | 624 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ |
| OLD | NEW |