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

Side by Side 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 unified diff | Download patch
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 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_ 5 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
6 #define CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_ 6 #define CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 // Returns true if content blockage was indicated to the user. 173 // Returns true if content blockage was indicated to the user.
174 bool IsBlockageIndicated(ContentSettingsType content_type) const; 174 bool IsBlockageIndicated(ContentSettingsType content_type) const;
175 175
176 void SetBlockageHasBeenIndicated(ContentSettingsType content_type); 176 void SetBlockageHasBeenIndicated(ContentSettingsType content_type);
177 177
178 // Returns whether a particular kind of content has been allowed. Currently 178 // Returns whether a particular kind of content has been allowed. Currently
179 // only tracks cookies. 179 // only tracks cookies.
180 bool IsContentAllowed(ContentSettingsType content_type) const; 180 bool IsContentAllowed(ContentSettingsType content_type) const;
181 181
182 // Returns the names of plugins that have been blocked for this tab. 182 // Returns the names of plugins that have been blocked for this tab.
183 const base::string16 GetBlockedPluginNames() const; 183 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.
184 return blocked_plugin_names_;
185 }
184 186
185 const GURL& media_stream_access_origin() const { 187 const GURL& media_stream_access_origin() const {
186 return media_stream_access_origin_; 188 return media_stream_access_origin_;
187 } 189 }
188 190
189 const std::string& media_stream_requested_audio_device() const { 191 const std::string& media_stream_requested_audio_device() const {
190 return media_stream_requested_audio_device_; 192 return media_stream_requested_audio_device_;
191 } 193 }
192 194
193 const std::string& media_stream_requested_video_device() const { 195 const std::string& media_stream_requested_video_device() const {
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
448 std::string media_stream_requested_audio_device_; 450 std::string media_stream_requested_audio_device_;
449 std::string media_stream_requested_video_device_; 451 std::string media_stream_requested_video_device_;
450 452
451 // Observer to watch for content settings changed. 453 // Observer to watch for content settings changed.
452 ScopedObserver<HostContentSettingsMap, content_settings::Observer> observer_; 454 ScopedObserver<HostContentSettingsMap, content_settings::Observer> observer_;
453 455
454 DISALLOW_COPY_AND_ASSIGN(TabSpecificContentSettings); 456 DISALLOW_COPY_AND_ASSIGN(TabSpecificContentSettings);
455 }; 457 };
456 458
457 #endif // CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_ 459 #endif // CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698