summaryrefslogtreecommitdiffstats
path: root/chrome/chrome.gyp
diff options
context:
space:
mode:
authorestark <estark@chromium.org>2015-09-09 12:37:04 -0700
committerCommit bot <commit-bot@chromium.org>2015-09-09 19:37:48 +0000
commit25f9af1b300a9a057ec3e74b3d33bf003156f441 (patch)
tree0ad0a5362702e95c024fd4641b5c5bbbe68ef2f6 /chrome/chrome.gyp
parentd3753f0aa06f9d1fa9d58ddd1b61c006f341adf1 (diff)
downloadchromium_src-25f9af1b300a9a057ec3e74b3d33bf003156f441.zip
chromium_src-25f9af1b300a9a057ec3e74b3d33bf003156f441.tar.gz
chromium_src-25f9af1b300a9a057ec3e74b3d33bf003156f441.tar.bz2
Revert of Refactor connection_security into SecurityStateModel (patchset #17 id:360001 of https://codereview.chromium.org/1314843007/ )
Reason for revert: We need to call SecurityStateChanged() in a few more places to avoid a crash and some UI bugs. See bugs 529664 and 529872. Original issue's description: > Refactor connection_security into SecurityStateModel > > This CL refactors the connection_security namespace (a namespace of > statics) into SecurityStateModel, a class attached to a WebContents that > drives the security UI for that WebContents. The SecurityStateModel > provides high-level security information about a page or request, with > the goal of reducing code duplication across various security UI > elements. > > In this first CL, I've introduced the SecurityStateModel and am using it > to drive the omnibox/lock icon, but have not yet adapted WebsiteSettings > to use a SecurityStateModel. > > BUG=528034 > TBR=sky@chromium.org > > Committed: https://crrev.com/83a81afbef8f265815cb6c6a48690511825a1ce5 > Cr-Commit-Position: refs/heads/master@{#347775} TBR=palmer@chromium.org,lgarron@chromium.org,pkasting@chromium.org,tedchoc@chromium.org,avi@chromium.org,sky@chromium.org,dzhioev@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=528034 Review URL: https://codereview.chromium.org/1324293003 Cr-Commit-Position: refs/heads/master@{#347980}
Diffstat (limited to 'chrome/chrome.gyp')
-rw-r--r--chrome/chrome.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index e49b2de..bda7831 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -575,7 +575,7 @@
'chrome_resources.gyp:chrome_strings',
'chrome_strings_grd',
'chrome_version_java',
- 'connection_security_levels_java',
+ 'connection_security_security_levels_java',
'connectivity_check_result_java',
'document_tab_model_info_proto_java',
'infobar_action_type_java',