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

Side by Side Diff: chrome/browser/ui/content_settings/content_setting_bubble_model.cc

Issue 2816593005: [subresource_filter] Don't regress the Mac UI (Closed)
Patch Set: fix Created 3 years, 8 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 unified diff | Download patch
« no previous file with comments | « chrome/browser/ui/content_settings/content_setting_bubble_model.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h" 5 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/feature_list.h" 10 #include "base/feature_list.h"
(...skipping 1238 matching lines...) Expand 10 before | Expand all | Expand 10 after
1249 set_manage_text( 1249 set_manage_text(
1250 l10n_util::GetStringUTF16(IDS_FILTERED_DECEPTIVE_CONTENT_PROMPT_RELOAD)); 1250 l10n_util::GetStringUTF16(IDS_FILTERED_DECEPTIVE_CONTENT_PROMPT_RELOAD));
1251 set_show_manage_text_as_checkbox(true); 1251 set_show_manage_text_as_checkbox(true);
1252 } 1252 }
1253 1253
1254 void ContentSettingSubresourceFilterBubbleModel::SetMessage() { 1254 void ContentSettingSubresourceFilterBubbleModel::SetMessage() {
1255 set_message(l10n_util::GetStringUTF16( 1255 set_message(l10n_util::GetStringUTF16(
1256 IDS_FILTERED_DECEPTIVE_CONTENT_PROMPT_EXPLANATION)); 1256 IDS_FILTERED_DECEPTIVE_CONTENT_PROMPT_EXPLANATION));
1257 } 1257 }
1258 1258
1259 // TODO(csharrison): This is only executed on Mac. It should also get the
1260 // updated UI with a checkbox.
1261 void ContentSettingSubresourceFilterBubbleModel::OnManageLinkClicked() {
1262 subresource_filter::ContentSubresourceFilterDriverFactory* driver_factory =
Bernhard Bauer 2017/04/12 17:19:53 Nit: You could use auto here.
Charlie Harrison 2017/04/12 18:05:33 Done here and below.
1263 subresource_filter::ContentSubresourceFilterDriverFactory::
1264 FromWebContents(web_contents());
1265 driver_factory->OnReloadRequested();
1266 }
1267
1259 void ContentSettingSubresourceFilterBubbleModel::OnManageCheckboxChecked( 1268 void ContentSettingSubresourceFilterBubbleModel::OnManageCheckboxChecked(
1260 bool is_checked) { 1269 bool is_checked) {
1261 if (is_checked) 1270 if (is_checked)
1262 set_done_button_text(l10n_util::GetStringUTF16(IDS_APP_MENU_RELOAD)); 1271 set_done_button_text(l10n_util::GetStringUTF16(IDS_APP_MENU_RELOAD));
1263 else 1272 else
1264 set_done_button_text(base::string16()); 1273 set_done_button_text(base::string16());
1265 is_checked_ = is_checked; 1274 is_checked_ = is_checked;
1266 } 1275 }
1267 1276
1268 void ContentSettingSubresourceFilterBubbleModel::OnDoneClicked() { 1277 void ContentSettingSubresourceFilterBubbleModel::OnDoneClicked() {
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
1599 1608
1600 ContentSettingSubresourceFilterBubbleModel* 1609 ContentSettingSubresourceFilterBubbleModel*
1601 ContentSettingBubbleModel::AsSubresourceFilterBubbleModel() { 1610 ContentSettingBubbleModel::AsSubresourceFilterBubbleModel() {
1602 return nullptr; 1611 return nullptr;
1603 } 1612 }
1604 1613
1605 ContentSettingDownloadsBubbleModel* 1614 ContentSettingDownloadsBubbleModel*
1606 ContentSettingBubbleModel::AsDownloadsBubbleModel() { 1615 ContentSettingBubbleModel::AsDownloadsBubbleModel() {
1607 return nullptr; 1616 return nullptr;
1608 } 1617 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/content_settings/content_setting_bubble_model.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698