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 <stddef.h> | 8 #include <stddef.h> |
9 | 9 |
10 #include <memory> | 10 #include <memory> |
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
250 content::TracingDelegate* GetTracingDelegate() override; | 250 content::TracingDelegate* GetTracingDelegate() override; |
251 bool IsPluginAllowedToCallRequestOSFileHandle( | 251 bool IsPluginAllowedToCallRequestOSFileHandle( |
252 content::BrowserContext* browser_context, | 252 content::BrowserContext* browser_context, |
253 const GURL& url) override; | 253 const GURL& url) override; |
254 bool IsPluginAllowedToUseDevChannelAPIs( | 254 bool IsPluginAllowedToUseDevChannelAPIs( |
255 content::BrowserContext* browser_context, | 255 content::BrowserContext* browser_context, |
256 const GURL& url) override; | 256 const GURL& url) override; |
257 void OverridePageVisibilityState( | 257 void OverridePageVisibilityState( |
258 content::RenderFrameHost* render_frame_host, | 258 content::RenderFrameHost* render_frame_host, |
259 blink::WebPageVisibilityState* visibility_state) override; | 259 blink::WebPageVisibilityState* visibility_state) override; |
| 260 bool ShouldAllowDisplayingInsecureContent( |
| 261 bool allowed_per_settings, |
| 262 const GURL& resource_url, |
| 263 content::WebContents* web_contents) override; |
| 264 bool ShouldAllowRunningInsecureContent( |
| 265 bool allowed_per_settings, |
| 266 const url::Origin& origin, |
| 267 const GURL& resource_url, |
| 268 content::WebContents* web_contents) override; |
260 | 269 |
261 #if defined(OS_ANDROID) | 270 #if defined(OS_ANDROID) |
262 void GetAdditionalMappedFilesForChildProcess( | 271 void GetAdditionalMappedFilesForChildProcess( |
263 const base::CommandLine& command_line, | 272 const base::CommandLine& command_line, |
264 int child_process_id, | 273 int child_process_id, |
265 content::FileDescriptorInfo* mappings, | 274 content::FileDescriptorInfo* mappings, |
266 std::map<int, base::MemoryMappedFile::Region>* regions) override; | 275 std::map<int, base::MemoryMappedFile::Region>* regions) override; |
267 #elif defined(OS_POSIX) && !defined(OS_MACOSX) | 276 #elif defined(OS_POSIX) && !defined(OS_MACOSX) |
268 void GetAdditionalMappedFilesForChildProcess( | 277 void GetAdditionalMappedFilesForChildProcess( |
269 const base::CommandLine& command_line, | 278 const base::CommandLine& command_line, |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
347 // Vector of additional ChromeContentBrowserClientParts. | 356 // Vector of additional ChromeContentBrowserClientParts. |
348 // Parts are deleted in the reverse order they are added. | 357 // Parts are deleted in the reverse order they are added. |
349 std::vector<ChromeContentBrowserClientParts*> extra_parts_; | 358 std::vector<ChromeContentBrowserClientParts*> extra_parts_; |
350 | 359 |
351 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; | 360 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; |
352 | 361 |
353 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); | 362 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); |
354 }; | 363 }; |
355 | 364 |
356 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 365 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
OLD | NEW |