| Index: chrome/browser/ui/content_settings/content_setting_bubble_model.cc
|
| diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
|
| index c50ca8b584ec8333c935870a7d4abb791bd7fd9b..96277b50116f8432054a02c85f65422dff31cb9b 100644
|
| --- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
|
| +++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
|
| @@ -545,8 +545,8 @@ ContentSettingPopupBubbleModel::ContentSettingPopupBubbleModel(
|
|
|
|
|
| void ContentSettingPopupBubbleModel::SetPopups() {
|
| - if (CommandLine::ForCurrentProcess()->HasSwitch(
|
| - switches::kEnableBetterPopupBlocking)) {
|
| + if (!CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kDisableBetterPopupBlocking)) {
|
| std::map<int32, GURL> blocked_popups =
|
| PopupBlockerTabHelper::FromWebContents(web_contents())
|
| ->GetBlockedPopupRequests();
|
| @@ -584,8 +584,8 @@ void ContentSettingPopupBubbleModel::SetPopups() {
|
|
|
| void ContentSettingPopupBubbleModel::OnPopupClicked(int index) {
|
| if (web_contents()) {
|
| - if (CommandLine::ForCurrentProcess()->HasSwitch(
|
| - switches::kEnableBetterPopupBlocking)) {
|
| + if (!CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kDisableBetterPopupBlocking)) {
|
| PopupBlockerTabHelper::FromWebContents(web_contents())->
|
| ShowBlockedPopup(bubble_content().popup_items[index].popup_id);
|
| } else {
|
|
|