Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(192)

Side by Side Diff: chrome_frame/chrome_tab.cc

Issue 66583008: Don't use UpdateRegistryFromResourceS as it's not in 2013 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 28 matching lines...) Expand all
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 "components/variations/entropy_provider.h" 45 #include "components/variations/entropy_provider.h"
46 #include "grit/chrome_frame_resources.h" 46 #include "grit/chrome_frame_resources.h"
47 #include "url/url_util.h" 47 #include "url/url_util.h"
48 48
49 #if _ATL_VER >= 0x0C00
50 // This was removed between the VS2010 version and the VS2013 version, and
51 // the unsuffixed version was repurposed to mean 'S'.
52 #define UpdateRegistryFromResourceS UpdateRegistryFromResource
53 #endif
54
49 using base::win::RegKey; 55 using base::win::RegKey;
50 56
51 namespace { 57 namespace {
52 58
53 const wchar_t kInternetSettings[] = 59 const wchar_t kInternetSettings[] =
54 L"Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings"; 60 L"Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings";
55 61
56 const wchar_t kProtocolHandlers[] = 62 const wchar_t kProtocolHandlers[] =
57 L"Software\\Classes\\Protocols\\Handler"; 63 L"Software\\Classes\\Protocols\\Handler";
58 64
(...skipping 943 matching lines...) Expand 10 before | Expand all | Expand 10 after
1002 HRESULT hr = CustomRegistration(ALL, FALSE, false); 1008 HRESULT hr = CustomRegistration(ALL, FALSE, false);
1003 return hr; 1009 return hr;
1004 } 1010 }
1005 1011
1006 // Object entries go here instead of with each object, so that we can move 1012 // Object entries go here instead of with each object, so that we can move
1007 // the objects to a lib. Also reduces magic. 1013 // the objects to a lib. Also reduces magic.
1008 OBJECT_ENTRY_AUTO(CLSID_ChromeFrameBHO, Bho) 1014 OBJECT_ENTRY_AUTO(CLSID_ChromeFrameBHO, Bho)
1009 OBJECT_ENTRY_AUTO(__uuidof(ChromeActiveDocument), ChromeActiveDocument) 1015 OBJECT_ENTRY_AUTO(__uuidof(ChromeActiveDocument), ChromeActiveDocument)
1010 OBJECT_ENTRY_AUTO(__uuidof(ChromeFrame), ChromeFrameActivex) 1016 OBJECT_ENTRY_AUTO(__uuidof(ChromeFrame), ChromeFrameActivex)
1011 OBJECT_ENTRY_AUTO(__uuidof(ChromeProtocol), ChromeProtocol) 1017 OBJECT_ENTRY_AUTO(__uuidof(ChromeProtocol), ChromeProtocol)
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698