| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome_frame/chrome_frame_activex.h" | 5 #include "chrome_frame/chrome_frame_activex.h" |
| 6 | 6 |
| 7 #include <wininet.h> | 7 #include <wininet.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <map> | 10 #include <map> |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 if (FAILED(hr)) | 121 if (FAILED(hr)) |
| 122 return hr; | 122 return hr; |
| 123 | 123 |
| 124 // No need to call FireOnChanged at this point since nobody will be listening. | 124 // No need to call FireOnChanged at this point since nobody will be listening. |
| 125 ready_state_ = READYSTATE_LOADING; | 125 ready_state_ = READYSTATE_LOADING; |
| 126 return S_OK; | 126 return S_OK; |
| 127 } | 127 } |
| 128 | 128 |
| 129 ChromeFrameActivex::~ChromeFrameActivex() { | 129 ChromeFrameActivex::~ChromeFrameActivex() { |
| 130 // We expect these to be released during a call to SetClientSite(NULL). | 130 // We expect these to be released during a call to SetClientSite(NULL). |
| 131 DCHECK_EQ(0, onmessage_.size()); | 131 DCHECK_EQ(0u, onmessage_.size()); |
| 132 DCHECK_EQ(0, onloaderror_.size()); | 132 DCHECK_EQ(0u, onloaderror_.size()); |
| 133 DCHECK_EQ(0, onload_.size()); | 133 DCHECK_EQ(0u, onload_.size()); |
| 134 DCHECK_EQ(0, onreadystatechanged_.size()); | 134 DCHECK_EQ(0u, onreadystatechanged_.size()); |
| 135 DCHECK_EQ(0, onextensionready_.size()); | 135 DCHECK_EQ(0u, onextensionready_.size()); |
| 136 | 136 |
| 137 if (chrome_wndproc_hook_) { | 137 if (chrome_wndproc_hook_) { |
| 138 BOOL unhook_success = ::UnhookWindowsHookEx(chrome_wndproc_hook_); | 138 BOOL unhook_success = ::UnhookWindowsHookEx(chrome_wndproc_hook_); |
| 139 DCHECK(unhook_success); | 139 DCHECK(unhook_success); |
| 140 } | 140 } |
| 141 | 141 |
| 142 // ChromeFramePlugin::Uninitialize() | 142 // ChromeFramePlugin::Uninitialize() |
| 143 Base::Uninitialize(); | 143 Base::Uninitialize(); |
| 144 | 144 |
| 145 TRACE_EVENT_END("chromeframe.createactivex", this, ""); | 145 TRACE_EVENT_END("chromeframe.createactivex", this, ""); |
| (...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 641 if (FAILED(hr)) { | 641 if (FAILED(hr)) { |
| 642 NOTREACHED() << "ChromeFrame BHO SetSite failed. Error:" | 642 NOTREACHED() << "ChromeFrame BHO SetSite failed. Error:" |
| 643 << StringPrintf(" 0x%08X", hr); | 643 << StringPrintf(" 0x%08X", hr); |
| 644 return hr; | 644 return hr; |
| 645 } | 645 } |
| 646 | 646 |
| 647 web_browser2->PutProperty(ScopedBstr(bho_class_id_as_string), | 647 web_browser2->PutProperty(ScopedBstr(bho_class_id_as_string), |
| 648 ScopedVariant(bho)); | 648 ScopedVariant(bho)); |
| 649 return S_OK; | 649 return S_OK; |
| 650 } | 650 } |
| OLD | NEW |