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

Unified Diff: ceee/ie/broker/broker_module.cc

Issue 6295006: Merge 68951 - Added refreshing of elevation policy on first run of new versio... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/597/src/
Patch Set: Created 9 years, 11 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 | « no previous file | ceee/ie/broker/broker_rpc_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ceee/ie/broker/broker_module.cc
===================================================================
--- ceee/ie/broker/broker_module.cc (revision 71509)
+++ ceee/ie/broker/broker_module.cc (working copy)
@@ -12,15 +12,16 @@
#include "base/debug/trace_event.h"
#include "base/logging.h"
#include "base/logging_win.h"
+#include "ceee/common/com_utils.h"
#include "ceee/ie/broker/broker.h"
#include "ceee/ie/broker/broker_rpc_server.h"
#include "ceee/ie/broker/chrome_postman.h"
#include "ceee/ie/broker/executors_manager.h"
#include "ceee/ie/broker/resource.h"
#include "ceee/ie/broker/window_events_funnel.h"
+#include "ceee/ie/common/ceee_module_util.h"
+#include "ceee/ie/common/crash_reporter.h"
#include "ceee/ie/plugin/toolband/toolband_proxy.h"
-#include "ceee/ie/common/crash_reporter.h"
-#include "ceee/common/com_utils.h"
#include "chrome/common/url_constants.h"
#include "chrome_frame/metrics_service.h"
@@ -214,7 +215,11 @@
}
HRESULT WINAPI CeeeBrokerModule::UpdateRegistryAppId(BOOL reg) throw() {
- return com::ModuleRegistrationWithoutAppid(IDR_BROKER_MODULE, reg);
+ HRESULT hr = com::ModuleRegistrationWithoutAppid(IDR_BROKER_MODULE, reg);
+ if (SUCCEEDED(hr)) {
+ ceee_module_util::RefreshElevationPolicyIfNeeded();
+ }
+ return hr;
}
namespace ceee_module_util {
« no previous file with comments | « no previous file | ceee/ie/broker/broker_rpc_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698