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 "base/basictypes.h" | 8 #include "base/basictypes.h" |
9 #include "base/callback_forward.h" | 9 #include "base/callback_forward.h" |
10 #include "base/process_util.h" | 10 #include "base/process_util.h" |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
71 public IPC::Sender, | 71 public IPC::Sender, |
72 public base::SupportsUserData { | 72 public base::SupportsUserData { |
73 public: | 73 public: |
74 struct CONTENT_EXPORT CreateParams { | 74 struct CONTENT_EXPORT CreateParams { |
75 explicit CreateParams(BrowserContext* context); | 75 explicit CreateParams(BrowserContext* context); |
76 CreateParams(BrowserContext* context, SiteInstance* site); | 76 CreateParams(BrowserContext* context, SiteInstance* site); |
77 | 77 |
78 BrowserContext* browser_context; | 78 BrowserContext* browser_context; |
79 SiteInstance* site_instance; | 79 SiteInstance* site_instance; |
80 int routing_id; | 80 int routing_id; |
| 81 int main_frame_routing_id; |
81 | 82 |
82 // Initial size of the new WebContent's view. Can be (0, 0) if not needed. | 83 // Initial size of the new WebContent's view. Can be (0, 0) if not needed. |
83 gfx::Size initial_size; | 84 gfx::Size initial_size; |
84 | 85 |
85 // Used to specify the location context which display the new view should | 86 // Used to specify the location context which display the new view should |
86 // belong. This can be NULL if not needed. | 87 // belong. This can be NULL if not needed. |
87 gfx::NativeView context; | 88 gfx::NativeView context; |
88 }; | 89 }; |
89 | 90 |
90 // Creates a new WebContents. | 91 // Creates a new WebContents. |
(...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
442 | 443 |
443 private: | 444 private: |
444 // This interface should only be implemented inside content. | 445 // This interface should only be implemented inside content. |
445 friend class WebContentsImpl; | 446 friend class WebContentsImpl; |
446 WebContents() {} | 447 WebContents() {} |
447 }; | 448 }; |
448 | 449 |
449 } // namespace content | 450 } // namespace content |
450 | 451 |
451 #endif // CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_H_ | 452 #endif // CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_H_ |
OLD | NEW |