| 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 #ifndef CHROME_FRAME_CHROME_FRAME_ACTIVEX_BASE_H_ | 5 #ifndef CHROME_FRAME_CHROME_FRAME_ACTIVEX_BASE_H_ |
| 6 #define CHROME_FRAME_CHROME_FRAME_ACTIVEX_BASE_H_ | 6 #define CHROME_FRAME_CHROME_FRAME_ACTIVEX_BASE_H_ |
| 7 | 7 |
| 8 #include <atlbase.h> | 8 #include <atlbase.h> |
| 9 #include <atlcom.h> | 9 #include <atlcom.h> |
| 10 #include <atlctl.h> | 10 #include <atlctl.h> |
| (...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 246 aspect = DVASPECT_CONTENT; | 246 aspect = DVASPECT_CONTENT; |
| 247 | 247 |
| 248 return CComControl<T>::IViewObject_Draw(aspect, index, aspect_info, ptd, | 248 return CComControl<T>::IViewObject_Draw(aspect, index, aspect_info, ptd, |
| 249 info_dc, dc, bounds, win_bounds); | 249 info_dc, dc, bounds, win_bounds); |
| 250 } | 250 } |
| 251 | 251 |
| 252 DECLARE_PROTECT_FINAL_CONSTRUCT() | 252 DECLARE_PROTECT_FINAL_CONSTRUCT() |
| 253 | 253 |
| 254 void SetResourceModule() { | 254 void SetResourceModule() { |
| 255 DCHECK(NULL == prev_resource_instance_); | 255 DCHECK(NULL == prev_resource_instance_); |
| 256 SimpleResourceLoader* loader_instance = SimpleResourceLoader::instance(); | 256 SimpleResourceLoader* loader_instance = SimpleResourceLoader::GetInstance(); |
| 257 DCHECK(loader_instance); | 257 DCHECK(loader_instance); |
| 258 HMODULE res_dll = loader_instance->GetResourceModuleHandle(); | 258 HMODULE res_dll = loader_instance->GetResourceModuleHandle(); |
| 259 _AtlBaseModule.SetResourceInstance(res_dll); | 259 _AtlBaseModule.SetResourceInstance(res_dll); |
| 260 } | 260 } |
| 261 | 261 |
| 262 HRESULT FinalConstruct() { | 262 HRESULT FinalConstruct() { |
| 263 SetResourceModule(); | 263 SetResourceModule(); |
| 264 | 264 |
| 265 if (!Initialize()) | 265 if (!Initialize()) |
| 266 return E_OUTOFMEMORY; | 266 return E_OUTOFMEMORY; |
| (...skipping 1008 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1275 EventHandlers onextensionready_; | 1275 EventHandlers onextensionready_; |
| 1276 | 1276 |
| 1277 // Handle network requests when host network stack is used. Passed to the | 1277 // Handle network requests when host network stack is used. Passed to the |
| 1278 // automation client on initialization. | 1278 // automation client on initialization. |
| 1279 scoped_ptr<UrlmonUrlRequestManager> url_fetcher_; | 1279 scoped_ptr<UrlmonUrlRequestManager> url_fetcher_; |
| 1280 | 1280 |
| 1281 HINSTANCE prev_resource_instance_; | 1281 HINSTANCE prev_resource_instance_; |
| 1282 }; | 1282 }; |
| 1283 | 1283 |
| 1284 #endif // CHROME_FRAME_CHROME_FRAME_ACTIVEX_BASE_H_ | 1284 #endif // CHROME_FRAME_CHROME_FRAME_ACTIVEX_BASE_H_ |
| OLD | NEW |