Revert of Refactor connection_security into SecurityStateModel (patchset #17 id:36000...
commit25f9af1b300a9a057ec3e74b3d33bf003156f441
authorestark <estark@chromium.org>
Wed, 9 Sep 2015 19:37:04 +0000 (9 12:37 -0700)
committerCommit bot <commit-bot@chromium.org>
Wed, 9 Sep 2015 19:37:48 +0000 (9 19:37 +0000)
tree0ad0a5362702e95c024fd4641b5c5bbbe68ef2f6
parentd3753f0aa06f9d1fa9d58ddd1b61c006f341adf1
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}
46 files changed:
chrome/android/BUILD.gn
chrome/android/java/src/org/chromium/chrome/browser/BluetoothChooserDialog.java
chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java
chrome/android/java/src/org/chromium/chrome/browser/ssl/ConnectionSecurity.java [new file with mode: 0644]
chrome/android/java/src/org/chromium/chrome/browser/ssl/SecurityStateModel.java [deleted file]
chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModel.java
chrome/browser/android/chrome_jni_registrar.cc
chrome/browser/android/chrome_web_contents_delegate_android.cc
chrome/browser/android/chrome_web_contents_delegate_android.h
chrome/browser/chromeos/login/ui/simple_web_view_dialog.cc
chrome/browser/ssl/connection_security.cc [moved from chrome/browser/ssl/security_state_model.cc with 52% similarity]
chrome/browser/ssl/connection_security.h [new file with mode: 0644]
chrome/browser/ssl/connection_security_android.cc [new file with mode: 0644]
chrome/browser/ssl/connection_security_android.h [new file with mode: 0644]
chrome/browser/ssl/security_state_model.h [deleted file]
chrome/browser/ssl/security_state_model_android.cc [deleted file]
chrome/browser/ssl/security_state_model_android.h [deleted file]
chrome/browser/ssl/security_state_model_browser_tests.cc [deleted file]
chrome/browser/ssl/ssl_browser_tests.cc
chrome/browser/ui/android/bluetooth_chooser_android.cc
chrome/browser/ui/android/toolbar/toolbar_model_android.cc
chrome/browser/ui/browser.cc
chrome/browser/ui/browser.h
chrome/browser/ui/browser_browsertest.cc
chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm
chrome/browser/ui/extensions/hosted_app_browser_controller.cc
chrome/browser/ui/tab_helpers.cc
chrome/browser/ui/toolbar/chrome_toolbar_model.h
chrome/browser/ui/toolbar/test_toolbar_model.cc
chrome/browser/ui/toolbar/test_toolbar_model.h
chrome/browser/ui/toolbar/toolbar_model_impl.cc
chrome/browser/ui/toolbar/toolbar_model_impl.h
chrome/browser/ui/toolbar/toolbar_model_unittest.cc
chrome/browser/ui/views/location_bar/location_bar_view.cc
chrome/browser/ui/views/location_bar/location_bar_view.h
chrome/browser/ui/views/omnibox/omnibox_view_views.cc
chrome/browser/ui/views/omnibox/omnibox_view_views.h
chrome/chrome.gyp
chrome/chrome_browser.gypi
chrome/chrome_tests.gypi
components/web_contents_delegate_android/web_contents_delegate_android.cc
components/web_contents_delegate_android/web_contents_delegate_android.h
content/browser/frame_host/interstitial_page_impl.cc
content/public/browser/web_contents_delegate.h