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

Side by Side Diff: chrome/browser/ui/browser.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: Address jam@ comments; many minor code and comment updates. Created 3 years, 11 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 (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_UI_BROWSER_H_ 5 #ifndef CHROME_BROWSER_UI_BROWSER_H_
6 #define CHROME_BROWSER_UI_BROWSER_H_ 6 #define CHROME_BROWSER_UI_BROWSER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 478 matching lines...) Expand 10 before | Expand all | Expand 10 after
489 content::WebContents* web_contents, 489 content::WebContents* web_contents,
490 content::SecurityStyleExplanations* security_style_explanations) override; 490 content::SecurityStyleExplanations* security_style_explanations) override;
491 void ShowCertificateViewerInDevTools( 491 void ShowCertificateViewerInDevTools(
492 content::WebContents* web_contents, 492 content::WebContents* web_contents,
493 scoped_refptr<net::X509Certificate> certificate) override; 493 scoped_refptr<net::X509Certificate> certificate) override;
494 std::unique_ptr<content::BluetoothChooser> RunBluetoothChooser( 494 std::unique_ptr<content::BluetoothChooser> RunBluetoothChooser(
495 content::RenderFrameHost* frame, 495 content::RenderFrameHost* frame,
496 const content::BluetoothChooser::EventHandler& event_handler) override; 496 const content::BluetoothChooser::EventHandler& event_handler) override;
497 void RequestAppBannerFromDevTools( 497 void RequestAppBannerFromDevTools(
498 content::WebContents* web_contents) override; 498 content::WebContents* web_contents) override;
499 void PassiveInsecureContentFound(const GURL& resource_url) override;
500 bool ShouldAllowRunningInsecureContent(
501 bool allowed_per_settings,
502 const url::Origin& origin,
503 const GURL& resource_url,
504 content::WebContents* web_contents) override;
499 505
500 bool is_type_tabbed() const { return type_ == TYPE_TABBED; } 506 bool is_type_tabbed() const { return type_ == TYPE_TABBED; }
501 bool is_type_popup() const { return type_ == TYPE_POPUP; } 507 bool is_type_popup() const { return type_ == TYPE_POPUP; }
502 508
503 bool is_app() const; 509 bool is_app() const;
504 bool is_devtools() const; 510 bool is_devtools() const;
505 511
506 // True when the mouse cursor is locked. 512 // True when the mouse cursor is locked.
507 bool IsMouseLocked() const; 513 bool IsMouseLocked() const;
508 514
(...skipping 506 matching lines...) Expand 10 before | Expand all | Expand 10 after
1015 // The following factory is used for chrome update coalescing. 1021 // The following factory is used for chrome update coalescing.
1016 base::WeakPtrFactory<Browser> chrome_updater_factory_; 1022 base::WeakPtrFactory<Browser> chrome_updater_factory_;
1017 1023
1018 // The following factory is used to close the frame at a later time. 1024 // The following factory is used to close the frame at a later time.
1019 base::WeakPtrFactory<Browser> weak_factory_; 1025 base::WeakPtrFactory<Browser> weak_factory_;
1020 1026
1021 DISALLOW_COPY_AND_ASSIGN(Browser); 1027 DISALLOW_COPY_AND_ASSIGN(Browser);
1022 }; 1028 };
1023 1029
1024 #endif // CHROME_BROWSER_UI_BROWSER_H_ 1030 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698