| 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 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 // now it mimics what TabContents exposed, which is a fairly large API and may | 105 // now it mimics what TabContents exposed, which is a fairly large API and may |
| 106 // contain things that are not relevant to a common subset of views. See also | 106 // contain things that are not relevant to a common subset of views. See also |
| 107 // the comment in render_view_host_delegate.h about the size and scope of the | 107 // the comment in render_view_host_delegate.h about the size and scope of the |
| 108 // delegate API. | 108 // delegate API. |
| 109 // | 109 // |
| 110 // Right now, the concept of page navigation (both top level and frame) exists | 110 // Right now, the concept of page navigation (both top level and frame) exists |
| 111 // in the TabContents still, so if you instantiate one of these elsewhere, you | 111 // in the TabContents still, so if you instantiate one of these elsewhere, you |
| 112 // will not be able to traverse pages back and forward. We need to determine | 112 // will not be able to traverse pages back and forward. We need to determine |
| 113 // if we want to bring that and other functionality down into this object so | 113 // if we want to bring that and other functionality down into this object so |
| 114 // it can be shared by others. | 114 // it can be shared by others. |
| 115 // | |
| 116 // TODO(joi): Move to content namespace. | |
| 117 class CONTENT_EXPORT RenderViewHostImpl | 115 class CONTENT_EXPORT RenderViewHostImpl |
| 118 : public RenderViewHost, | 116 : public RenderViewHost, |
| 119 public RenderWidgetHostImpl { | 117 public RenderWidgetHostImpl { |
| 120 public: | 118 public: |
| 121 // Convenience function, just like RenderViewHost::FromID. | 119 // Convenience function, just like RenderViewHost::FromID. |
| 122 static RenderViewHostImpl* FromID(int render_process_id, int render_view_id); | 120 static RenderViewHostImpl* FromID(int render_process_id, int render_view_id); |
| 123 | 121 |
| 124 // routing_id could be a valid route id, or it could be MSG_ROUTING_NONE, in | 122 // routing_id could be a valid route id, or it could be MSG_ROUTING_NONE, in |
| 125 // which case RenderWidgetHost will create a new one. | 123 // which case RenderWidgetHost will create a new one. |
| 126 // | 124 // |
| (...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 625 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl); | 623 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl); |
| 626 }; | 624 }; |
| 627 | 625 |
| 628 #if defined(COMPILER_MSVC) | 626 #if defined(COMPILER_MSVC) |
| 629 #pragma warning(pop) | 627 #pragma warning(pop) |
| 630 #endif | 628 #endif |
| 631 | 629 |
| 632 } // namespace content | 630 } // namespace content |
| 633 | 631 |
| 634 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ | 632 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ |
| OLD | NEW |