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

Unified Diff: chrome/browser/ui/extensions/hosted_app_browser_controller.cc

Issue 1440303002: Componentize SecurityStateModel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: android/cros fixes Created 5 years, 1 month 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
« no previous file with comments | « chrome/browser/ui/cocoa/location_bar/location_icon_decoration.mm ('k') | chrome/browser/ui/tab_helpers.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/extensions/hosted_app_browser_controller.cc
diff --git a/chrome/browser/ui/extensions/hosted_app_browser_controller.cc b/chrome/browser/ui/extensions/hosted_app_browser_controller.cc
index 55febb5ea8afb89ee5f54dce9b21881185c40719..ad06793ad97a9603509371d7cc2b6b01dc002169 100644
--- a/chrome/browser/ui/extensions/hosted_app_browser_controller.cc
+++ b/chrome/browser/ui/extensions/hosted_app_browser_controller.cc
@@ -6,7 +6,7 @@
#include "base/command_line.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ssl/security_state_model.h"
+#include "chrome/browser/ssl/chrome_security_state_model_delegate.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_window.h"
#include "chrome/browser/ui/host_desktop.h"
@@ -92,11 +92,11 @@ bool HostedAppBrowserController::ShouldShowLocationBar() const {
if (web_contents->GetLastCommittedURL().is_empty())
return false;
- const SecurityStateModel* model =
- SecurityStateModel::FromWebContents(web_contents);
- if (model &&
- model->GetSecurityInfo().security_level ==
- SecurityStateModel::SECURITY_ERROR)
+ const ChromeSecurityStateModelDelegate* model_delegate =
+ ChromeSecurityStateModelDelegate::FromWebContents(web_contents);
+ if (model_delegate &&
+ model_delegate->GetSecurityInfo().security_level ==
+ security_state::SECURITY_ERROR)
return true;
GURL launch_url = AppLaunchInfo::GetLaunchWebURL(extension);
« no previous file with comments | « chrome/browser/ui/cocoa/location_bar/location_icon_decoration.mm ('k') | chrome/browser/ui/tab_helpers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698