OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 CHROME_BROWSER_BACKGROUND_BACKGROUND_CONTENTS_H_ | 5 #ifndef CHROME_BROWSER_BACKGROUND_BACKGROUND_CONTENTS_H_ |
6 #define CHROME_BROWSER_BACKGROUND_BACKGROUND_CONTENTS_H_ | 6 #define CHROME_BROWSER_BACKGROUND_BACKGROUND_CONTENTS_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
47 const gfx::Rect& initial_rect, | 47 const gfx::Rect& initial_rect, |
48 bool user_gesture, | 48 bool user_gesture, |
49 bool* was_blocked) = 0; | 49 bool* was_blocked) = 0; |
50 | 50 |
51 protected: | 51 protected: |
52 virtual ~Delegate() {} | 52 virtual ~Delegate() {} |
53 }; | 53 }; |
54 | 54 |
55 BackgroundContents( | 55 BackgroundContents( |
56 content::SiteInstance* site_instance, | 56 content::SiteInstance* site_instance, |
57 int routing_id, | 57 int32_t routing_id, |
58 int main_frame_routing_id, | 58 int32_t main_frame_routing_id, |
| 59 int32_t main_frame_widget_routing_id, |
59 Delegate* delegate, | 60 Delegate* delegate, |
60 const std::string& partition_id, | 61 const std::string& partition_id, |
61 content::SessionStorageNamespace* session_storage_namespace); | 62 content::SessionStorageNamespace* session_storage_namespace); |
62 ~BackgroundContents() override; | 63 ~BackgroundContents() override; |
63 | 64 |
64 content::WebContents* web_contents() const { return web_contents_.get(); } | 65 content::WebContents* web_contents() const { return web_contents_.get(); } |
65 virtual const GURL& GetURL() const; | 66 virtual const GURL& GetURL() const; |
66 | 67 |
67 // Adds this BackgroundContents to the queue of RenderViews to create. | 68 // Adds this BackgroundContents to the queue of RenderViews to create. |
68 void CreateRenderViewSoon(const GURL& url); | 69 void CreateRenderViewSoon(const GURL& url); |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
125 BackgroundContents* contents; | 126 BackgroundContents* contents; |
126 | 127 |
127 // The name of the parent frame for these contents. | 128 // The name of the parent frame for these contents. |
128 const std::string& frame_name; | 129 const std::string& frame_name; |
129 | 130 |
130 // The ID of the parent application (if any). | 131 // The ID of the parent application (if any). |
131 const base::string16& application_id; | 132 const base::string16& application_id; |
132 }; | 133 }; |
133 | 134 |
134 #endif // CHROME_BROWSER_BACKGROUND_BACKGROUND_CONTENTS_H_ | 135 #endif // CHROME_BROWSER_BACKGROUND_BACKGROUND_CONTENTS_H_ |
OLD | NEW |