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

Unified Diff: chrome_frame/chrome_tab.cc

Issue 7976045: Fix in-use updates for Chrome Frame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sanity check before dcommit Created 9 years, 3 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome_frame/chrome_frame_elevation.rgs ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/chrome_tab.cc
diff --git a/chrome_frame/chrome_tab.cc b/chrome_frame/chrome_tab.cc
index 7b80394fcf29a0984df7ae6c825b3952b47a0008..7cd7706c7b3f87c7886f1c24bbc7b279346bfd75 100644
--- a/chrome_frame/chrome_tab.cc
+++ b/chrome_frame/chrome_tab.cc
@@ -8,6 +8,7 @@
#include "chrome_tab.h" // NOLINT
#include <atlsecurity.h>
+#include <objbase.h>
#include "base/at_exit.h"
#include "base/command_line.h"
@@ -173,6 +174,13 @@ class ChromeTabModule : public CAtlDllModuleT<ChromeTabModule> {
DCHECK(SUCCEEDED(hr));
}
+ if (SUCCEEDED(hr)) {
+ // Add the Chrome Frame CLSID.
+ wchar_t cf_clsid[64];
+ StringFromGUID2(CLSID_ChromeFrame, &cf_clsid[0], arraysize(cf_clsid));
+ hr = registrar->AddReplacement(L"CHROME_FRAME_CLSID", &cf_clsid[0]);
+ }
+
return hr;
}
@@ -599,13 +607,10 @@ HRESULT RegisterActiveX(bool reg, bool is_system) {
HRESULT RegisterElevationPolicy(bool reg, bool is_system) {
HRESULT hr = S_OK;
- if (reg && base::win::GetVersion() >= base::win::VERSION_VISTA) {
+ if (base::win::GetVersion() >= base::win::VERSION_VISTA) {
// Register the elevation policy. This must succeed for Chrome Frame to
// be able launch Chrome when running in low-integrity IE.
- // Note that this is not done on unregistration, the installer will
- // explicitly remove the policy on uninstall.
- hr = _AtlModule.UpdateRegistryFromResourceS(IDR_CHROMEFRAME_ELEVATION,
- reg);
+ hr = _AtlModule.UpdateRegistryFromResourceS(IDR_CHROMEFRAME_ELEVATION, reg);
if (SUCCEEDED(hr)) {
hr = RefreshElevationPolicy();
}
« no previous file with comments | « chrome_frame/chrome_frame_elevation.rgs ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698