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> |
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/file_util.h" | 14 #include "base/file_util.h" |
15 #include "base/logging.h" | 15 #include "base/logging.h" |
16 #include "base/path_service.h" | 16 #include "base/path_service.h" |
17 #include "base/process_util.h" | 17 #include "base/process_util.h" |
18 #include "base/scoped_bstr_win.h" | 18 #include "base/scoped_bstr_win.h" |
19 #include "base/singleton.h" | 19 #include "base/singleton.h" |
| 20 #include "base/string_split.h" |
20 #include "base/string_util.h" | 21 #include "base/string_util.h" |
21 #include "base/trace_event.h" | 22 #include "base/trace_event.h" |
22 #include "base/utf_string_conversions.h" | 23 #include "base/utf_string_conversions.h" |
23 #include "chrome/common/chrome_constants.h" | 24 #include "chrome/common/chrome_constants.h" |
24 #include "chrome/common/chrome_switches.h" | 25 #include "chrome/common/chrome_switches.h" |
25 #include "chrome/test/automation/tab_proxy.h" | 26 #include "chrome/test/automation/tab_proxy.h" |
26 #include "googleurl/src/gurl.h" | 27 #include "googleurl/src/gurl.h" |
27 #include "chrome_frame/utils.h" | 28 #include "chrome_frame/utils.h" |
28 | 29 |
29 namespace { | 30 namespace { |
(...skipping 629 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
659 if (FAILED(hr)) { | 660 if (FAILED(hr)) { |
660 NOTREACHED() << "ChromeFrame BHO SetSite failed. Error:" | 661 NOTREACHED() << "ChromeFrame BHO SetSite failed. Error:" |
661 << StringPrintf(" 0x%08X", hr); | 662 << StringPrintf(" 0x%08X", hr); |
662 return hr; | 663 return hr; |
663 } | 664 } |
664 | 665 |
665 web_browser2->PutProperty(ScopedBstr(bho_class_id_as_string), | 666 web_browser2->PutProperty(ScopedBstr(bho_class_id_as_string), |
666 ScopedVariant(bho)); | 667 ScopedVariant(bho)); |
667 return S_OK; | 668 return S_OK; |
668 } | 669 } |
OLD | NEW |