| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_CONTENT_BROWSER_CLIENT_H_ | 5 #ifndef CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_CONTENT_BROWSER_CLIENT_H_ |
| 6 #define CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_CONTENT_BROWSER_CLIENT_H_ | 6 #define CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_CONTENT_BROWSER_CLIENT_H_ |
| 7 | 7 |
| 8 #include "content/shell/browser/shell_content_browser_client.h" | 8 #include "content/shell/browser/shell_content_browser_client.h" |
| 9 | 9 |
| 10 namespace content { | 10 namespace content { |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 void AppendExtraCommandLineSwitches(base::CommandLine* command_line, | 36 void AppendExtraCommandLineSwitches(base::CommandLine* command_line, |
| 37 int child_process_id) override; | 37 int child_process_id) override; |
| 38 BrowserMainParts* CreateBrowserMainParts( | 38 BrowserMainParts* CreateBrowserMainParts( |
| 39 const MainFunctionParams& parameters) override; | 39 const MainFunctionParams& parameters) override; |
| 40 void GetQuotaSettings( | 40 void GetQuotaSettings( |
| 41 content::BrowserContext* context, | 41 content::BrowserContext* context, |
| 42 content::StoragePartition* partition, | 42 content::StoragePartition* partition, |
| 43 const storage::OptionalQuotaSettingsCallback& callback) override; | 43 const storage::OptionalQuotaSettingsCallback& callback) override; |
| 44 | 44 |
| 45 PlatformNotificationService* GetPlatformNotificationService() override; | 45 PlatformNotificationService* GetPlatformNotificationService() override; |
| 46 bool ShouldAllowRunningInsecureContent( |
| 47 bool allowed_per_settings, |
| 48 const url::Origin& origin, |
| 49 const GURL& resource_url, |
| 50 content::WebContents* web_contents) override; |
| 46 | 51 |
| 47 private: | 52 private: |
| 48 std::unique_ptr<LayoutTestNotificationManager> | 53 std::unique_ptr<LayoutTestNotificationManager> |
| 49 layout_test_notification_manager_; | 54 layout_test_notification_manager_; |
| 50 }; | 55 }; |
| 51 | 56 |
| 52 } // content | 57 } // content |
| 53 | 58 |
| 54 #endif // CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_CONTENT_BROWSER_CLIENT_
H_ | 59 #endif // CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_CONTENT_BROWSER_CLIENT_
H_ |
| OLD | NEW |