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

Issue 106713004: Remove kEnableResourceContentSettings and all the code that uses it since it's been behind a flag f… (Closed)

Created:
7 years ago by jam
Modified:
7 years ago
Reviewers:
Bernhard Bauer
CC:
chromium-reviews, joi+watch-content_chromium.org, darin-cc_chromium.org, markusheintz_
Visibility:
Public.

Description

Remove kEnableResourceContentSettings and all the code that uses it since it's been behind a flag for years and isn't used. BUG=39252 R=bauerb@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=240115

Patch Set 1 #

Total comments: 2

Patch Set 2 : more code and sync #

Patch Set 3 : #

Patch Set 4 : #

Patch Set 5 : #

Total comments: 2

Patch Set 6 : review comments #

Unified diffs Side-by-side diffs Delta from patch set Stats (+84 lines, -471 lines) Patch
M chrome/browser/content_settings/host_content_settings_map.h View 1 1 chunk +1 line, -4 lines 0 comments Download
M chrome/browser/content_settings/host_content_settings_map.cc View 1 2 chunks +2 lines, -3 lines 0 comments Download
M chrome/browser/content_settings/host_content_settings_map_unittest.cc View 1 1 chunk +0 lines, -97 lines 0 comments Download
M chrome/browser/content_settings/tab_specific_content_settings.h View 1 5 chunks +1 line, -14 lines 0 comments Download
M chrome/browser/content_settings/tab_specific_content_settings.cc View 1 14 chunks +13 lines, -50 lines 0 comments Download
M chrome/browser/content_settings/tab_specific_content_settings_unittest.cc View 1 1 chunk +3 lines, -6 lines 0 comments Download
M chrome/browser/plugins/plugin_infobar_delegates.cc View 1 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc View 1 1 chunk +1 line, -2 lines 0 comments Download
M chrome/browser/ui/blocked_content/popup_blocker_tab_helper.cc View 1 2 chunks +2 lines, -2 lines 0 comments Download
M chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm View 1 2 3 4 1 chunk +6 lines, -23 lines 0 comments Download
M chrome/browser/ui/content_settings/content_setting_bubble_model.h View 1 3 chunks +0 lines, -3 lines 0 comments Download
M chrome/browser/ui/content_settings/content_setting_bubble_model.cc View 1 2 3 4 5 11 chunks +26 lines, -104 lines 0 comments Download
M chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc View 1 5 chunks +5 lines, -77 lines 0 comments Download
M chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc View 1 1 chunk +1 line, -2 lines 0 comments Download
M chrome/browser/ui/gtk/content_setting_bubble_gtk.cc View 1 2 3 1 chunk +0 lines, -21 lines 0 comments Download
M chrome/browser/ui/views/content_setting_bubble_contents.cc View 1 2 3 1 chunk +0 lines, -14 lines 0 comments Download
M chrome/common/chrome_switches.cc View 1 1 chunk +0 lines, -5 lines 0 comments Download
M chrome/common/render_messages.h View 1 1 chunk +2 lines, -3 lines 0 comments Download
M chrome/renderer/chrome_content_renderer_client.cc View 1 2 chunks +2 lines, -2 lines 0 comments Download
M chrome/renderer/content_settings_observer.h View 1 1 chunk +1 line, -5 lines 0 comments Download
M chrome/renderer/content_settings_observer.cc View 1 3 chunks +7 lines, -13 lines 0 comments Download
M chrome/renderer/content_settings_observer_browsertest.cc View 1 7 chunks +10 lines, -20 lines 0 comments Download

Messages

Total messages: 7 (0 generated)
jam
7 years ago (2013-12-10 20:02:26 UTC) #1
Bernhard Bauer
https://codereview.chromium.org/106713004/diff/1/chrome/browser/content_settings/tab_specific_content_settings.h File chrome/browser/content_settings/tab_specific_content_settings.h (left): https://codereview.chromium.org/106713004/diff/1/chrome/browser/content_settings/tab_specific_content_settings.h#oldcode298 chrome/browser/content_settings/tab_specific_content_settings.h:298: const std::string& resource_identifier); I'm wondering if we should keep ...
7 years ago (2013-12-10 23:14:05 UTC) #2
Bernhard Bauer
There's also more code that's hanging off the switch; see ContentSettingTitleAndLinkModel::SetBlockedResources() and the UI classes ...
7 years ago (2013-12-10 23:16:41 UTC) #3
jam
On 2013/12/10 23:16:41, Bernhard Bauer wrote: > There's also more code that's hanging off the ...
7 years ago (2013-12-11 00:15:38 UTC) #4
jam
ptal, hopefully I got everything but I haven't touched this code before, so there's a ...
7 years ago (2013-12-11 01:32:47 UTC) #5
Bernhard Bauer
Nice! LGTM w/ a nit below: https://codereview.chromium.org/106713004/diff/70001/chrome/browser/ui/content_settings/content_setting_bubble_model.cc File chrome/browser/ui/content_settings/content_setting_bubble_model.cc (right): https://codereview.chromium.org/106713004/diff/70001/chrome/browser/ui/content_settings/content_setting_bubble_model.cc#newcode332 chrome/browser/ui/content_settings/content_setting_bubble_model.cc:332: ContentSetting most_restrictive_setting; |most_restrictive_setting| ...
7 years ago (2013-12-11 08:43:24 UTC) #6
jam
7 years ago (2013-12-11 15:44:10 UTC) #7
https://codereview.chromium.org/106713004/diff/70001/chrome/browser/ui/conten...
File chrome/browser/ui/content_settings/content_setting_bubble_model.cc (right):

https://codereview.chromium.org/106713004/diff/70001/chrome/browser/ui/conten...
chrome/browser/ui/content_settings/content_setting_bubble_model.cc:332:
ContentSetting most_restrictive_setting;
On 2013/12/11 08:43:25, Bernhard Bauer wrote:
> |most_restrictive_setting| etc. also date from when we used to[*] iterate over
> all blocked plugins. Now that we don't anymore, it should simply be called
> |setting|.
> 
> You can also move the declarations of |map| and |cookie_settings| to where
they
> are used, below.
> 
> [*] Ha, I'm already using past tense!

Done.

Powered by Google App Engine
This is Rietveld 408576698