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 CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 5 #ifndef CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
7 | 7 |
8 #include <set> | 8 #include <set> |
9 #include <string> | 9 #include <string> |
10 #include <utility> | 10 #include <utility> |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
63 virtual void GetStoragePartitionConfigForSite( | 63 virtual void GetStoragePartitionConfigForSite( |
64 content::BrowserContext* browser_context, | 64 content::BrowserContext* browser_context, |
65 const GURL& site, | 65 const GURL& site, |
66 bool can_be_default, | 66 bool can_be_default, |
67 std::string* partition_domain, | 67 std::string* partition_domain, |
68 std::string* partition_name, | 68 std::string* partition_name, |
69 bool* in_memory) OVERRIDE; | 69 bool* in_memory) OVERRIDE; |
70 virtual content::WebContentsViewDelegate* GetWebContentsViewDelegate( | 70 virtual content::WebContentsViewDelegate* GetWebContentsViewDelegate( |
71 content::WebContents* web_contents) OVERRIDE; | 71 content::WebContents* web_contents) OVERRIDE; |
72 virtual void GuestWebContentsCreated( | 72 virtual void GuestWebContentsCreated( |
| 73 int guest_instance_id, |
73 content::SiteInstance* guest_site_instance, | 74 content::SiteInstance* guest_site_instance, |
74 content::WebContents* guest_web_contents, | 75 content::WebContents* guest_web_contents, |
75 content::WebContents* opener_web_contents, | 76 content::WebContents* opener_web_contents, |
76 content::BrowserPluginGuestDelegate** guest_delegate, | 77 content::BrowserPluginGuestDelegate** guest_delegate, |
77 scoped_ptr<base::DictionaryValue> extra_params) OVERRIDE; | 78 scoped_ptr<base::DictionaryValue> extra_params) OVERRIDE; |
78 virtual void GuestWebContentsAttached( | 79 virtual void GuestWebContentsAttached( |
79 content::WebContents* guest_web_contents, | 80 content::WebContents* guest_web_contents, |
80 content::WebContents* embedder_web_contents, | 81 content::WebContents* embedder_web_contents, |
81 const base::DictionaryValue& extra_params) OVERRIDE; | 82 const base::DictionaryValue& extra_params) OVERRIDE; |
82 virtual void RenderProcessWillLaunch( | 83 virtual void RenderProcessWillLaunch( |
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
315 prerender::PrerenderTracker* prerender_tracker_; | 316 prerender::PrerenderTracker* prerender_tracker_; |
316 | 317 |
317 friend class DisableWebRtcEncryptionFlagTest; | 318 friend class DisableWebRtcEncryptionFlagTest; |
318 | 319 |
319 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); | 320 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); |
320 }; | 321 }; |
321 | 322 |
322 } // namespace chrome | 323 } // namespace chrome |
323 | 324 |
324 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 325 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
OLD | NEW |