diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-04 17:15:39 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-04 17:15:39 +0000 |
| commit | 09c50bd7d765f29c2ab1d73dc99da906e394a6ce (patch) | |
| tree | fe982e9fea12ea598f26aefdcd398e86d79fa868 | |
| parent | 55b07563b4943dd5de2498e5f8820ade763a9b1f (diff) | |
| download | chromium_src-09c50bd7d765f29c2ab1d73dc99da906e394a6ce.zip chromium_src-09c50bd7d765f29c2ab1d73dc99da906e394a6ce.tar.gz chromium_src-09c50bd7d765f29c2ab1d73dc99da906e394a6ce.tar.bz2 | |
Fix merge error
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116331 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/browser/ssl/ssl_manager.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/content/browser/ssl/ssl_manager.cc b/content/browser/ssl/ssl_manager.cc index be7f7d3..597569c 100644 --- a/content/browser/ssl/ssl_manager.cc +++ b/content/browser/ssl/ssl_manager.cc @@ -110,7 +110,7 @@ SSLManager::SSLManager(NavigationControllerImpl* controller) // Subscribe to various notifications. registrar_.Add(this, content::NOTIFICATION_FAIL_PROVISIONAL_LOAD_WITH_ERROR, - content::Source<:NavigationController>(controller_)); + content::Source<NavigationController>(controller_)); registrar_.Add( this, content::NOTIFICATION_RESOURCE_RESPONSE_STARTED, content::Source<WebContents>(controller_->tab_contents())); |