| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 429 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 440 | 440 |
| 441 ScopedBstr profile_name_arg; | 441 ScopedBstr profile_name_arg; |
| 442 service_hr = service->GetChromeProfileName(profile_name_arg.Receive()); | 442 service_hr = service->GetChromeProfileName(profile_name_arg.Receive()); |
| 443 if (S_OK == service_hr && profile_name_arg) | 443 if (S_OK == service_hr && profile_name_arg) |
| 444 profile_name.assign(profile_name_arg, profile_name_arg.Length()); | 444 profile_name.assign(profile_name_arg, profile_name_arg.Length()); |
| 445 } | 445 } |
| 446 | 446 |
| 447 url_fetcher_.set_frame_busting(!is_privileged_); | 447 url_fetcher_.set_frame_busting(!is_privileged_); |
| 448 automation_client_->SetUrlFetcher(&url_fetcher_); | 448 automation_client_->SetUrlFetcher(&url_fetcher_); |
| 449 if (!InitializeAutomation(profile_name, chrome_extra_arguments, | 449 if (!InitializeAutomation(profile_name, chrome_extra_arguments, |
| 450 IsIEInPrivate(), true)) { | 450 IsIEInPrivate())) { |
| 451 return E_FAIL; | 451 return E_FAIL; |
| 452 } | 452 } |
| 453 } | 453 } |
| 454 | 454 |
| 455 return hr; | 455 return hr; |
| 456 } | 456 } |
| 457 | 457 |
| 458 HRESULT ChromeFrameActivex::GetObjectScriptId(IHTMLObjectElement* object_elem, | 458 HRESULT ChromeFrameActivex::GetObjectScriptId(IHTMLObjectElement* object_elem, |
| 459 BSTR* id) { | 459 BSTR* id) { |
| 460 DCHECK(object_elem != NULL); | 460 DCHECK(object_elem != NULL); |
| (...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 589 if (FAILED(hr)) | 589 if (FAILED(hr)) |
| 590 return hr; | 590 return hr; |
| 591 | 591 |
| 592 HWND top_window = ::GetAncestor(parent_wnd, GA_ROOT); | 592 HWND top_window = ::GetAncestor(parent_wnd, GA_ROOT); |
| 593 chrome_wndproc_hook_ = InstallLocalWindowHook(top_window); | 593 chrome_wndproc_hook_ = InstallLocalWindowHook(top_window); |
| 594 if (chrome_wndproc_hook_) | 594 if (chrome_wndproc_hook_) |
| 595 TopLevelWindowMapping::instance()->AddMapping(top_window, m_hWnd); | 595 TopLevelWindowMapping::instance()->AddMapping(top_window, m_hWnd); |
| 596 | 596 |
| 597 return chrome_wndproc_hook_ ? S_OK : E_FAIL; | 597 return chrome_wndproc_hook_ ? S_OK : E_FAIL; |
| 598 } | 598 } |
| OLD | NEW |