Index: chrome/browser/ui/toolbar/toolbar_model_delegate.h |
diff --git a/chrome/browser/ui/toolbar/toolbar_model_delegate.h b/chrome/browser/ui/toolbar/toolbar_model_delegate.h |
index 182d7508a53a2593ce2846b7887e380b4b3ad9e9..cdaf0a902f60eb433f9b67c2ec6d4b7e683776b2 100644 |
--- a/chrome/browser/ui/toolbar/toolbar_model_delegate.h |
+++ b/chrome/browser/ui/toolbar/toolbar_model_delegate.h |
@@ -7,7 +7,9 @@ |
#include <string> |
+#include "base/memory/ref_counted.h" |
#include "base/strings/string16.h" |
+#include "components/security_state/security_state_model.h" |
class GURL; |
@@ -15,11 +17,14 @@ namespace content { |
class WebContents; |
} |
+namespace net { |
+class X509Certificate; |
+} |
+ |
// Delegate which is used by ToolbarModel class. |
class ToolbarModelDelegate { |
public: |
- // Returns active WebContents. |
- virtual content::WebContents* GetActiveWebContents() const = 0; |
+ typedef security_state::SecurityStateModel::SecurityLevel SecurityLevel; |
Peter Kasting
2016/02/02 23:51:30
Nit: Prefer type aliases to typedefs
sdefresne
2016/02/03 13:14:17
Done.
|
// Returns the value to use for Accept-Languages HTTP header when making an |
// HTTP request. |
@@ -31,6 +36,27 @@ class ToolbarModelDelegate { |
const GURL& url, |
const base::string16& formatted_url) const = 0; |
+ // Returns true and set |url| to the current navigation entry URL if it |
Peter Kasting
2016/02/02 23:51:30
Nit: sets
|
+ // exists. Otherwise returns false and leaves |url| unmodified. |
+ virtual bool GetURL(GURL* url) const = 0; |
+ |
+ // Returns whether the URL for the current navigation entry should be |
+ // in the location bar. |
Peter Kasting
2016/02/02 23:51:30
Nit: should be displayed in
sdefresne
2016/02/03 13:14:17
Done.
|
+ virtual bool ShouldDisplayURL() const = 0; |
+ |
+ // Returns the underlying security level of the page without regard to any |
+ // user edits that may be in progress. |
+ virtual SecurityLevel GetSecurityLevel() const = 0; |
+ |
+ // Returns search terms as in search::GetSearchTerms() if such terms should |
+ // appear in the omnibox (i.e. the page is sufficiently secure, search term |
+ // replacement is enabled, editing is not in progress, etc.) given that the |
+ // page has a security level of |security_level|. |
+ virtual base::string16 GetSearchTerms(SecurityLevel security_level) const = 0; |
+ |
+ // Returns the certificate for the current navigation entry. |
+ virtual scoped_refptr<net::X509Certificate> GetCertificate() const = 0; |
+ |
protected: |
virtual ~ToolbarModelDelegate() {} |
}; |