| 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_PUBLIC_BROWSER_WEB_CONTENTS_H_ | 5 #ifndef CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_H_ |
| 6 #define CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_H_ | 6 #define CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_H_ |
| 7 | 7 |
| 8 #include <set> | 8 #include <set> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 struct WebFindOptions; | 38 struct WebFindOptions; |
| 39 } | 39 } |
| 40 | 40 |
| 41 namespace net { | 41 namespace net { |
| 42 struct LoadStateWithParam; | 42 struct LoadStateWithParam; |
| 43 } | 43 } |
| 44 | 44 |
| 45 namespace content { | 45 namespace content { |
| 46 | 46 |
| 47 class BrowserContext; | 47 class BrowserContext; |
| 48 class BrowserPluginGuestDelegate; |
| 48 class InterstitialPage; | 49 class InterstitialPage; |
| 49 class PageState; | 50 class PageState; |
| 50 class RenderFrameHost; | 51 class RenderFrameHost; |
| 51 class RenderProcessHost; | 52 class RenderProcessHost; |
| 52 class RenderViewHost; | 53 class RenderViewHost; |
| 53 class RenderWidgetHostView; | 54 class RenderWidgetHostView; |
| 54 class SiteInstance; | 55 class SiteInstance; |
| 55 class WebContentsDelegate; | 56 class WebContentsDelegate; |
| 56 struct CustomContextMenuContext; | 57 struct CustomContextMenuContext; |
| 57 struct DropData; | 58 struct DropData; |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 bool opener_suppressed; | 103 bool opener_suppressed; |
| 103 int routing_id; | 104 int routing_id; |
| 104 int main_frame_routing_id; | 105 int main_frame_routing_id; |
| 105 | 106 |
| 106 // Initial size of the new WebContent's view. Can be (0, 0) if not needed. | 107 // Initial size of the new WebContent's view. Can be (0, 0) if not needed. |
| 107 gfx::Size initial_size; | 108 gfx::Size initial_size; |
| 108 | 109 |
| 109 // True if the contents should be initially hidden. | 110 // True if the contents should be initially hidden. |
| 110 bool initially_hidden; | 111 bool initially_hidden; |
| 111 | 112 |
| 112 // If this instance ID is non-zero then it indicates that this WebContents | 113 // If non-null then this WebContents will be hosted by a BrowserPlugin. |
| 113 // should behave as a guest. | 114 BrowserPluginGuestDelegate* guest_delegate; |
| 114 int guest_instance_id; | |
| 115 | |
| 116 // TODO(fsamuel): This is temporary. Remove this once all guests are created | |
| 117 // from the content embedder. | |
| 118 scoped_ptr<base::DictionaryValue> guest_extra_params; | |
| 119 | 115 |
| 120 // Used to specify the location context which display the new view should | 116 // Used to specify the location context which display the new view should |
| 121 // belong. This can be NULL if not needed. | 117 // belong. This can be NULL if not needed. |
| 122 gfx::NativeView context; | 118 gfx::NativeView context; |
| 123 }; | 119 }; |
| 124 | 120 |
| 125 // Creates a new WebContents. | 121 // Creates a new WebContents. |
| 126 CONTENT_EXPORT static WebContents* Create(const CreateParams& params); | 122 CONTENT_EXPORT static WebContents* Create(const CreateParams& params); |
| 127 | 123 |
| 128 // Similar to Create() above but should be used when you need to prepopulate | 124 // Similar to Create() above but should be used when you need to prepopulate |
| (...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 597 | 593 |
| 598 private: | 594 private: |
| 599 // This interface should only be implemented inside content. | 595 // This interface should only be implemented inside content. |
| 600 friend class WebContentsImpl; | 596 friend class WebContentsImpl; |
| 601 WebContents() {} | 597 WebContents() {} |
| 602 }; | 598 }; |
| 603 | 599 |
| 604 } // namespace content | 600 } // namespace content |
| 605 | 601 |
| 606 #endif // CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_H_ | 602 #endif // CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_H_ |
| OLD | NEW |