| OLD | NEW |
| 1 // Copyright 2009, Google Inc. All rights reserved. | 1 // Copyright 2009, Google Inc. All rights reserved. |
| 2 // Portions of this file were adapted from the Mozilla project. | 2 // Portions of this file were adapted from the Mozilla project. |
| 3 // See https://developer.mozilla.org/en/ActiveX_Control_for_Hosting_Netscape_Plu
g-ins_in_IE | 3 // See https://developer.mozilla.org/en/ActiveX_Control_for_Hosting_Netscape_Plu
g-ins_in_IE |
| 4 /* ***** BEGIN LICENSE BLOCK ***** | 4 /* ***** BEGIN LICENSE BLOCK ***** |
| 5 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 | 5 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 |
| 6 * | 6 * |
| 7 * The contents of this file are subject to the Mozilla Public License Version | 7 * The contents of this file are subject to the Mozilla Public License Version |
| 8 * 1.1 (the "License"); you may not use this file except in compliance with | 8 * 1.1 (the "License"); you may not use this file except in compliance with |
| 9 * the License. You may obtain a copy of the License at | 9 * the License. You may obtain a copy of the License at |
| 10 * http://www.mozilla.org/MPL/ | 10 * http://www.mozilla.org/MPL/ |
| (...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 561 window.type = NPWindowTypeWindow; | 561 window.type = NPWindowTypeWindow; |
| 562 window.x = lprcPosRect->left; | 562 window.x = lprcPosRect->left; |
| 563 window.y = lprcPosRect->top; | 563 window.y = lprcPosRect->top; |
| 564 window.width = lprcPosRect->right - lprcPosRect->left; | 564 window.width = lprcPosRect->right - lprcPosRect->left; |
| 565 window.height = lprcPosRect->bottom - lprcPosRect->top; | 565 window.height = lprcPosRect->bottom - lprcPosRect->top; |
| 566 if (!plugin_proxy_->SetWindow(window)) { | 566 if (!plugin_proxy_->SetWindow(window)) { |
| 567 return E_FAIL; | 567 return E_FAIL; |
| 568 } | 568 } |
| 569 } | 569 } |
| 570 | 570 |
| 571 return IOleInPlaceObjectWindowlessImpl::SetObjectRects(lprcPosRect, | 571 return CComControlBase::IOleInPlaceObject_SetObjectRects(lprcPosRect, |
| 572 lprcClipRect); | 572 lprcClipRect); |
| 573 } | 573 } |
| 574 | 574 |
| 575 HRESULT CHostControl::GetStringProperty(NPPVariable np_property_variable, | 575 HRESULT CHostControl::GetStringProperty(NPPVariable np_property_variable, |
| 576 BSTR* string) { | 576 BSTR* string) { |
| 577 HRESULT hr; | 577 HRESULT hr; |
| 578 if (FAILED(hr = ConstructPluginProxy())) { | 578 if (FAILED(hr = ConstructPluginProxy())) { |
| 579 return hr; | 579 return hr; |
| 580 } | 580 } |
| 581 | 581 |
| 582 char* property = NULL; | 582 char* property = NULL; |
| (...skipping 28 matching lines...) Expand all Loading... |
| 611 | 611 |
| 612 HRESULT hr; | 612 HRESULT hr; |
| 613 NPPluginProxy* plugin_proxy = NULL; | 613 NPPluginProxy* plugin_proxy = NULL; |
| 614 if (FAILED(hr = NPPluginProxy::Create(&plugin_proxy))) { | 614 if (FAILED(hr = NPPluginProxy::Create(&plugin_proxy))) { |
| 615 return hr; | 615 return hr; |
| 616 } | 616 } |
| 617 | 617 |
| 618 plugin_proxy_.reset(plugin_proxy); | 618 plugin_proxy_.reset(plugin_proxy); |
| 619 return S_OK; | 619 return S_OK; |
| 620 } | 620 } |
| OLD | NEW |