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

Unified Diff: chrome/browser/ui/views/location_bar/location_bar_view.h

Issue 1539043002: Pull SecurityStateModel out into a component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: unit test debugging Created 5 years 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/location_bar/location_bar_view.h
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h
index 68cf65b658092ab6f8003274a12d6bb5ffff8948..a79f6ee256737fb5013e8d2b34929b7861f1c1eb 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.h
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.h
@@ -11,7 +11,6 @@
#include "base/compiler_specific.h"
#include "base/prefs/pref_member.h"
#include "chrome/browser/extensions/extension_context_menu_model.h"
-#include "chrome/browser/ssl/security_state_model.h"
#include "chrome/browser/ui/location_bar/location_bar.h"
#include "chrome/browser/ui/omnibox/chrome_omnibox_edit_controller.h"
#include "chrome/browser/ui/toolbar/chrome_toolbar_model.h"
@@ -20,6 +19,7 @@
#include "chrome/browser/ui/views/extensions/extension_popup.h"
#include "chrome/browser/ui/views/omnibox/omnibox_view_views.h"
#include "components/search_engines/template_url_service_observer.h"
+#include "components/security_state/security_state_model.h"
#include "components/ui/zoom/zoom_event_manager_observer.h"
#include "ui/gfx/animation/animation_delegate.h"
#include "ui/gfx/animation/slide_animation.h"
@@ -103,7 +103,8 @@ class LocationBarView : public LocationBar,
virtual void ShowWebsiteSettings(
content::WebContents* web_contents,
const GURL& url,
- const SecurityStateModel::SecurityInfo& security_info) = 0;
+ const security_state::SecurityStateModel::SecurityInfo&
+ security_info) = 0;
protected:
virtual ~Delegate() {}
@@ -139,7 +140,7 @@ class LocationBarView : public LocationBar,
// Returns the color to be used for security text in the context of
// |security_level|.
SkColor GetSecureTextColor(
- SecurityStateModel::SecurityLevel security_level) const;
+ security_state::SecurityStateModel::SecurityLevel security_level) const;
// Returns the delegate.
Delegate* delegate() const { return delegate_; }

Powered by Google App Engine
This is Rietveld 408576698