Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(265)

Side by Side Diff: content/shell/browser/layout_test/layout_test_content_browser_client.h

Issue 1905033002: PlzNavigate: Move navigation-level mixed content checks to the browser. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@console-security-message
Patch Set: Overall code cleanup to request reviewers to PTAL. Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 16 matching lines...) Expand all
27 27
28 // ContentBrowserClient overrides. 28 // ContentBrowserClient overrides.
29 void RenderProcessWillLaunch(RenderProcessHost* host) override; 29 void RenderProcessWillLaunch(RenderProcessHost* host) override;
30 void OverrideWebkitPrefs(RenderViewHost* render_view_host, 30 void OverrideWebkitPrefs(RenderViewHost* render_view_host,
31 WebPreferences* prefs) override; 31 WebPreferences* prefs) override;
32 void ResourceDispatcherHostCreated() override; 32 void ResourceDispatcherHostCreated() override;
33 void AppendExtraCommandLineSwitches(base::CommandLine* command_line, 33 void AppendExtraCommandLineSwitches(base::CommandLine* command_line,
34 int child_process_id) override; 34 int child_process_id) override;
35 BrowserMainParts* CreateBrowserMainParts( 35 BrowserMainParts* CreateBrowserMainParts(
36 const MainFunctionParams& parameters) override; 36 const MainFunctionParams& parameters) override;
37
38 PlatformNotificationService* GetPlatformNotificationService() override; 37 PlatformNotificationService* GetPlatformNotificationService() override;
38 bool ShouldAllowDisplayingInsecureContent(
39 bool allowed_per_settings,
40 const GURL& resource_url,
41 content::WebContents* web_contents) override;
42 bool ShouldAllowRunningInsecureContent(
43 bool allowed_per_settings,
44 const url::Origin& origin,
45 const GURL& resource_url,
46 content::WebContents* web_contents) override;
39 47
40 private: 48 private:
41 std::unique_ptr<LayoutTestNotificationManager> 49 std::unique_ptr<LayoutTestNotificationManager>
42 layout_test_notification_manager_; 50 layout_test_notification_manager_;
43 }; 51 };
44 52
45 } // content 53 } // content
46 54
47 #endif // CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_CONTENT_BROWSER_CLIENT_ H_ 55 #endif // CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_CONTENT_BROWSER_CLIENT_ H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698