| 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 21 matching lines...) Expand all Loading... |
| 32 | 32 |
| 33 namespace base { | 33 namespace base { |
| 34 class DictionaryValue; | 34 class DictionaryValue; |
| 35 class TimeTicks; | 35 class TimeTicks; |
| 36 } | 36 } |
| 37 | 37 |
| 38 namespace blink { | 38 namespace blink { |
| 39 struct WebFindOptions; | 39 struct WebFindOptions; |
| 40 } | 40 } |
| 41 | 41 |
| 42 namespace mus { |
| 43 class Window; |
| 44 } |
| 45 |
| 42 namespace net { | 46 namespace net { |
| 43 struct LoadStateWithParam; | 47 struct LoadStateWithParam; |
| 44 } | 48 } |
| 45 | 49 |
| 46 namespace content { | 50 namespace content { |
| 47 | 51 |
| 48 class BrowserContext; | 52 class BrowserContext; |
| 49 class BrowserPluginGuestDelegate; | 53 class BrowserPluginGuestDelegate; |
| 50 class InterstitialPage; | 54 class InterstitialPage; |
| 51 class PageState; | 55 class PageState; |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 | 132 |
| 129 // Initial size of the new WebContent's view. Can be (0, 0) if not needed. | 133 // Initial size of the new WebContent's view. Can be (0, 0) if not needed. |
| 130 gfx::Size initial_size; | 134 gfx::Size initial_size; |
| 131 | 135 |
| 132 // True if the contents should be initially hidden. | 136 // True if the contents should be initially hidden. |
| 133 bool initially_hidden; | 137 bool initially_hidden; |
| 134 | 138 |
| 135 // If non-null then this WebContents will be hosted by a BrowserPlugin. | 139 // If non-null then this WebContents will be hosted by a BrowserPlugin. |
| 136 BrowserPluginGuestDelegate* guest_delegate; | 140 BrowserPluginGuestDelegate* guest_delegate; |
| 137 | 141 |
| 142 #if defined(MOJO_SHELL_CLIENT) |
| 143 // If non-null then this WebContents will be hosted by a mus::Window. |
| 144 mus::Window* mus_window; |
| 145 #endif |
| 146 |
| 138 // Used to specify the location context which display the new view should | 147 // Used to specify the location context which display the new view should |
| 139 // belong. This can be nullptr if not needed. | 148 // belong. This can be nullptr if not needed. |
| 140 gfx::NativeView context; | 149 gfx::NativeView context; |
| 141 | 150 |
| 142 // Used to specify that the new WebContents creation is driven by the | 151 // Used to specify that the new WebContents creation is driven by the |
| 143 // renderer process. In this case, the renderer-side objects, such as | 152 // renderer process. In this case, the renderer-side objects, such as |
| 144 // RenderFrame, have already been created on the renderer side, and | 153 // RenderFrame, have already been created on the renderer side, and |
| 145 // WebContents construction should take this into account. | 154 // WebContents construction should take this into account. |
| 146 bool renderer_initiated_creation; | 155 bool renderer_initiated_creation; |
| 147 }; | 156 }; |
| (...skipping 552 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 700 | 709 |
| 701 private: | 710 private: |
| 702 // This interface should only be implemented inside content. | 711 // This interface should only be implemented inside content. |
| 703 friend class WebContentsImpl; | 712 friend class WebContentsImpl; |
| 704 WebContents() {} | 713 WebContents() {} |
| 705 }; | 714 }; |
| 706 | 715 |
| 707 } // namespace content | 716 } // namespace content |
| 708 | 717 |
| 709 #endif // CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_H_ | 718 #endif // CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_H_ |
| OLD | NEW |