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

Unified Diff: chrome_frame/chrome_frame_activex.cc

Issue 5814004: Fixing a regression introduced with r69101, which now prevents Chrome Frame... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years 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 | chrome_frame/chrome_frame_activex_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/chrome_frame_activex.cc
===================================================================
--- chrome_frame/chrome_frame_activex.cc (revision 69128)
+++ chrome_frame/chrome_frame_activex.cc (working copy)
@@ -210,7 +210,7 @@
if (target.compare("*") != 0) {
bool drop = true;
- if (is_privileged_) {
+ if (is_privileged()) {
// Forward messages if the control is in privileged mode.
ScopedComPtr<IDispatch> message_event;
if (SUCCEEDED(CreateDomEvent("message", message, origin,
@@ -272,7 +272,7 @@
Base::OnAutomationServerLaunchFailed(reason, server_version);
if (reason == AUTOMATION_VERSION_MISMATCH &&
- ShouldShowVersionMismatchDialog(is_privileged_, m_spClientSite)) {
+ ShouldShowVersionMismatchDialog(is_privileged(), m_spClientSite)) {
THREAD_SAFE_UMA_HISTOGRAM_COUNTS(
"ChromeFrame.VersionMismatchDisplayed", 1);
DisplayVersionMismatchWarning(m_hWnd, server_version);
@@ -427,7 +427,7 @@
handlers[i]->clear();
// Drop privileged mode on uninitialization.
- is_privileged_ = false;
+ set_is_privileged(false);
} else {
ScopedComPtr<IHTMLDocument2> document;
GetContainingDocument(document.Receive());
@@ -448,13 +448,13 @@
service_hr = service->GetWantsPrivileged(&wants_privileged);
if (SUCCEEDED(service_hr) && wants_privileged)
- is_privileged_ = true;
+ set_is_privileged(true);
- url_fetcher_->set_privileged_mode(is_privileged_);
+ url_fetcher_->set_privileged_mode(is_privileged());
}
std::wstring profile_name(GetHostProcessName(false));
- if (is_privileged_) {
+ if (is_privileged()) {
base::win::ScopedBstr automated_functions_arg;
service_hr = service->GetExtensionApisToAutomate(
@@ -491,7 +491,7 @@
chrome_extra_arguments.append(
ASCIIToWide(switches::kEnableExperimentalExtensionApis));
- url_fetcher_->set_frame_busting(!is_privileged_);
+ url_fetcher_->set_frame_busting(!is_privileged());
automation_client_->SetUrlFetcher(url_fetcher_.get());
if (!InitializeAutomation(profile_name, chrome_extra_arguments,
IsIEInPrivate(), true, GURL(utf8_url),
« no previous file with comments | « no previous file | chrome_frame/chrome_frame_activex_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698