diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-23 20:51:01 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-23 20:51:01 +0000 |
| commit | 3921d1954d9dfe490d179fe2c750bcab4980d533 (patch) | |
| tree | 37d27749acb449a9807b4b4c355edcaf19fa5f57 /chrome_frame/chrome_frame_activex.cc | |
| parent | 21805a1bb44a59bfbb3ff1741b3efd2bc4e0667e (diff) | |
| download | chromium_src-3921d1954d9dfe490d179fe2c750bcab4980d533.zip chromium_src-3921d1954d9dfe490d179fe2c750bcab4980d533.tar.gz chromium_src-3921d1954d9dfe490d179fe2c750bcab4980d533.tar.bz2 | |
Revert 42366 - Allow TabContentsDelegate classes to specify whether InfoBars are enabled.
Allow ChromeFrame to pass infobar enabled parameter to ExternalTabContainer.
BUG=2444936
Patch contributed by ericdingle@google.com
Original review at http://codereview.chromium.org/890005
TBR=joi@chromium.org
Review URL: http://codereview.chromium.org/1205001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42378 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame_activex.cc')
| -rw-r--r-- | chrome_frame/chrome_frame_activex.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome_frame/chrome_frame_activex.cc b/chrome_frame/chrome_frame_activex.cc index f982072..a88c5f1 100644 --- a/chrome_frame/chrome_frame_activex.cc +++ b/chrome_frame/chrome_frame_activex.cc @@ -447,7 +447,7 @@ HRESULT ChromeFrameActivex::IOleObject_SetClientSite( url_fetcher_.set_frame_busting(!is_privileged_); automation_client_->SetUrlFetcher(&url_fetcher_); if (!InitializeAutomation(profile_name, chrome_extra_arguments, - IsIEInPrivate(), true)) { + IsIEInPrivate())) { return E_FAIL; } } |