| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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> |
| 11 | 11 |
| 12 #include "base/basictypes.h" | 12 #include "base/basictypes.h" |
| 13 #include "base/command_line.h" | 13 #include "base/command_line.h" |
| 14 #include "base/debug/trace_event.h" | 14 #include "base/debug/trace_event.h" |
| 15 #include "base/logging.h" | 15 #include "base/logging.h" |
| 16 #include "base/memory/singleton.h" | 16 #include "base/memory/singleton.h" |
| 17 #include "base/path_service.h" | 17 #include "base/path_service.h" |
| 18 #include "base/process_util.h" | |
| 19 #include "base/strings/string_split.h" | 18 #include "base/strings/string_split.h" |
| 20 #include "base/strings/string_util.h" | 19 #include "base/strings/string_util.h" |
| 21 #include "base/strings/stringprintf.h" | 20 #include "base/strings/stringprintf.h" |
| 22 #include "base/strings/utf_string_conversions.h" | 21 #include "base/strings/utf_string_conversions.h" |
| 23 #include "base/win/scoped_bstr.h" | 22 #include "base/win/scoped_bstr.h" |
| 24 #include "base/win/scoped_variant.h" | 23 #include "base/win/scoped_variant.h" |
| 25 #include "chrome/common/automation_messages.h" | 24 #include "chrome/common/automation_messages.h" |
| 26 #include "chrome/common/chrome_constants.h" | 25 #include "chrome/common/chrome_constants.h" |
| 27 #include "chrome/common/chrome_switches.h" | 26 #include "chrome/common/chrome_switches.h" |
| 28 #include "chrome/test/automation/tab_proxy.h" | 27 #include "chrome/test/automation/tab_proxy.h" |
| (...skipping 665 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 694 if (FAILED(hr)) { | 693 if (FAILED(hr)) { |
| 695 NOTREACHED() << "ChromeFrame BHO SetSite failed. Error:" | 694 NOTREACHED() << "ChromeFrame BHO SetSite failed. Error:" |
| 696 << base::StringPrintf(" 0x%08X", hr); | 695 << base::StringPrintf(" 0x%08X", hr); |
| 697 return hr; | 696 return hr; |
| 698 } | 697 } |
| 699 | 698 |
| 700 web_browser2->PutProperty(base::win::ScopedBstr(bho_class_id_as_string), | 699 web_browser2->PutProperty(base::win::ScopedBstr(bho_class_id_as_string), |
| 701 base::win::ScopedVariant(bho)); | 700 base::win::ScopedVariant(bho)); |
| 702 return S_OK; | 701 return S_OK; |
| 703 } | 702 } |
| OLD | NEW |