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

Unified Diff: chrome/browser/content_settings/tab_specific_content_settings.h

Issue 1025503002: Use same base class for popup and plugin blocking UI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix cocoa code Created 5 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/content_settings/tab_specific_content_settings.h
diff --git a/chrome/browser/content_settings/tab_specific_content_settings.h b/chrome/browser/content_settings/tab_specific_content_settings.h
index 2a6705b1473ab2a96b5aa63e38b6e0c4196d6117..a215bb12fb5c6e463937e26255f4ae84ff6a7367 100644
--- a/chrome/browser/content_settings/tab_specific_content_settings.h
+++ b/chrome/browser/content_settings/tab_specific_content_settings.h
@@ -180,7 +180,9 @@ class TabSpecificContentSettings
bool IsContentAllowed(ContentSettingsType content_type) const;
// Returns the names of plugins that have been blocked for this tab.
- const base::string16 GetBlockedPluginNames() const;
+ std::vector<base::string16> GetBlockedPluginNames() const {
msw 2015/03/20 22:06:33 nit: rename this blocked_plugin_names()
meacer 2015/03/20 23:39:42 Done.
+ return blocked_plugin_names_;
+ }
const GURL& media_stream_access_origin() const {
return media_stream_access_origin_;

Powered by Google App Engine
This is Rietveld 408576698