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 // chrome_tab.cc : Implementation of DLL Exports. | 5 // chrome_tab.cc : Implementation of DLL Exports. |
6 | 6 |
7 // Need to include this before the ATL headers below. | 7 // Need to include this before the ATL headers below. |
8 #include "chrome_frame/chrome_tab.h" | 8 #include "chrome_frame/chrome_tab.h" |
9 | 9 |
10 #include <atlsecurity.h> | 10 #include <atlsecurity.h> |
(...skipping 24 matching lines...) Expand all Loading... |
35 #include "chrome_frame/chrome_frame_activex.h" | 35 #include "chrome_frame/chrome_frame_activex.h" |
36 #include "chrome_frame/chrome_frame_automation.h" | 36 #include "chrome_frame/chrome_frame_automation.h" |
37 #include "chrome_frame/chrome_frame_reporting.h" | 37 #include "chrome_frame/chrome_frame_reporting.h" |
38 #include "chrome_frame/chrome_launcher_utils.h" | 38 #include "chrome_frame/chrome_launcher_utils.h" |
39 #include "chrome_frame/chrome_protocol.h" | 39 #include "chrome_frame/chrome_protocol.h" |
40 #include "chrome_frame/dll_redirector.h" | 40 #include "chrome_frame/dll_redirector.h" |
41 #include "chrome_frame/exception_barrier.h" | 41 #include "chrome_frame/exception_barrier.h" |
42 #include "chrome_frame/pin_module.h" | 42 #include "chrome_frame/pin_module.h" |
43 #include "chrome_frame/resource.h" | 43 #include "chrome_frame/resource.h" |
44 #include "chrome_frame/utils.h" | 44 #include "chrome_frame/utils.h" |
45 #include "googleurl/src/url_util.h" | |
46 #include "grit/chrome_frame_resources.h" | 45 #include "grit/chrome_frame_resources.h" |
| 46 #include "url/url_util.h" |
47 | 47 |
48 using base::win::RegKey; | 48 using base::win::RegKey; |
49 | 49 |
50 namespace { | 50 namespace { |
51 | 51 |
52 const wchar_t kInternetSettings[] = | 52 const wchar_t kInternetSettings[] = |
53 L"Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings"; | 53 L"Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings"; |
54 | 54 |
55 const wchar_t kProtocolHandlers[] = | 55 const wchar_t kProtocolHandlers[] = |
56 L"Software\\Classes\\Protocols\\Handler"; | 56 L"Software\\Classes\\Protocols\\Handler"; |
(...skipping 917 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
974 HRESULT hr = CustomRegistration(ALL, FALSE, false); | 974 HRESULT hr = CustomRegistration(ALL, FALSE, false); |
975 return hr; | 975 return hr; |
976 } | 976 } |
977 | 977 |
978 // Object entries go here instead of with each object, so that we can move | 978 // Object entries go here instead of with each object, so that we can move |
979 // the objects to a lib. Also reduces magic. | 979 // the objects to a lib. Also reduces magic. |
980 OBJECT_ENTRY_AUTO(CLSID_ChromeFrameBHO, Bho) | 980 OBJECT_ENTRY_AUTO(CLSID_ChromeFrameBHO, Bho) |
981 OBJECT_ENTRY_AUTO(__uuidof(ChromeActiveDocument), ChromeActiveDocument) | 981 OBJECT_ENTRY_AUTO(__uuidof(ChromeActiveDocument), ChromeActiveDocument) |
982 OBJECT_ENTRY_AUTO(__uuidof(ChromeFrame), ChromeFrameActivex) | 982 OBJECT_ENTRY_AUTO(__uuidof(ChromeFrame), ChromeFrameActivex) |
983 OBJECT_ENTRY_AUTO(__uuidof(ChromeProtocol), ChromeProtocol) | 983 OBJECT_ENTRY_AUTO(__uuidof(ChromeProtocol), ChromeProtocol) |
OLD | NEW |