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

Side by Side Diff: chrome/browser/content_settings/tab_specific_content_settings.h

Issue 319553008: Updated Plugin bubble model to add "learn more" link and to appear with a sliding yellow thing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed typos Created 6 years, 6 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 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 // Set whether the setting for the pending handler is DEFAULT (ignore), 251 // Set whether the setting for the pending handler is DEFAULT (ignore),
252 // ALLOW, or DENY. 252 // ALLOW, or DENY.
253 void set_pending_protocol_handler_setting(ContentSetting setting) { 253 void set_pending_protocol_handler_setting(ContentSetting setting) {
254 pending_protocol_handler_setting_ = setting; 254 pending_protocol_handler_setting_ = setting;
255 } 255 }
256 256
257 ContentSetting pending_protocol_handler_setting() const { 257 ContentSetting pending_protocol_handler_setting() const {
258 return pending_protocol_handler_setting_; 258 return pending_protocol_handler_setting_;
259 } 259 }
260 260
261 //Set whether the setting for the plugin bubble mode is Allow, Block or Run
felt 2014/06/11 02:37:29 You need a space and a period at the end of the se
radhikabhar 2014/06/11 17:31:46 Done.
262 //this time
263 void set_plugin_bubble_setting(ContentSetting setting) {
264 plugin_bubble_setting_ = setting;
265 }
266
267 ContentSetting plugin_bubble_setting() const {
268 return plugin_bubble_setting_;
269 }
261 270
262 // Returns a pointer to the |LocalSharedObjectsContainer| that contains all 271 // Returns a pointer to the |LocalSharedObjectsContainer| that contains all
263 // allowed local shared objects like cookies, local storage, ... . 272 // allowed local shared objects like cookies, local storage, ... .
264 const LocalSharedObjectsContainer& allowed_local_shared_objects() const { 273 const LocalSharedObjectsContainer& allowed_local_shared_objects() const {
265 return allowed_local_shared_objects_; 274 return allowed_local_shared_objects_;
266 } 275 }
267 276
268 // Returns a pointer to the |LocalSharedObjectsContainer| that contains all 277 // Returns a pointer to the |LocalSharedObjectsContainer| that contains all
269 // blocked local shared objects like cookies, local storage, ... . 278 // blocked local shared objects like cookies, local storage, ... .
270 const LocalSharedObjectsContainer& blocked_local_shared_objects() const { 279 const LocalSharedObjectsContainer& blocked_local_shared_objects() const {
271 return blocked_local_shared_objects_; 280 return blocked_local_shared_objects_;
272 } 281 }
273 282
283 // TODO(radhikabhar): This is no longer needed as we have deleted the custom
felt 2014/06/11 02:37:29 Why is this a TODO? Why aren't you doing it right
radhikabhar 2014/06/11 17:31:46 Removed it
284 // link in the plugin bubble model
274 bool load_plugins_link_enabled() { return load_plugins_link_enabled_; } 285 bool load_plugins_link_enabled() { return load_plugins_link_enabled_; }
275 void set_load_plugins_link_enabled(bool enabled) { 286 void set_load_plugins_link_enabled(bool enabled) {
276 load_plugins_link_enabled_ = enabled; 287 load_plugins_link_enabled_ = enabled;
277 } 288 }
278 289
279 // Called to indicate whether access to the Pepper broker was allowed or 290 // Called to indicate whether access to the Pepper broker was allowed or
280 // blocked. 291 // blocked.
281 void SetPepperBrokerAllowed(bool allowed); 292 void SetPepperBrokerAllowed(bool allowed);
282 293
283 // content::WebContentsObserver overrides. 294 // content::WebContentsObserver overrides.
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 409
399 // The previous protocol handler to be replaced by 410 // The previous protocol handler to be replaced by
400 // the pending_protocol_handler_, if there is one. Empty if 411 // the pending_protocol_handler_, if there is one. Empty if
401 // there is no handler which would be replaced. 412 // there is no handler which would be replaced.
402 ProtocolHandler previous_protocol_handler_; 413 ProtocolHandler previous_protocol_handler_;
403 414
404 // The setting on the pending protocol handler registration. Persisted in case 415 // The setting on the pending protocol handler registration. Persisted in case
405 // the user opens the bubble and makes changes multiple times. 416 // the user opens the bubble and makes changes multiple times.
406 ContentSetting pending_protocol_handler_setting_; 417 ContentSetting pending_protocol_handler_setting_;
407 418
419 // The setting on the plugin bubble model. Persisted in case
420 // the user opens the bubble and makes changes multiple times.
421 ContentSetting plugin_bubble_setting_;
422
423 // TODO(radhikabhar): This is no longer needed as we have got rid of the
424 // custom link
felt 2014/06/11 02:37:29 Same question, why is this a TODO?
radhikabhar 2014/06/11 17:31:46 Done.
408 // Stores whether the user can load blocked plugins on this page. 425 // Stores whether the user can load blocked plugins on this page.
409 bool load_plugins_link_enabled_; 426 bool load_plugins_link_enabled_;
410 427
411 content::NotificationRegistrar registrar_; 428 content::NotificationRegistrar registrar_;
412 429
413 // The origin of the media stream request. Note that we only support handling 430 // The origin of the media stream request. Note that we only support handling
414 // settings for one request per tab. The latest request's origin will be 431 // settings for one request per tab. The latest request's origin will be
415 // stored here. http://crbug.com/259794 432 // stored here. http://crbug.com/259794
416 GURL media_stream_access_origin_; 433 GURL media_stream_access_origin_;
417 434
418 // The devices to be displayed in the media bubble when the media stream 435 // The devices to be displayed in the media bubble when the media stream
419 // request is requesting certain specific devices. 436 // request is requesting certain specific devices.
420 std::string media_stream_requested_audio_device_; 437 std::string media_stream_requested_audio_device_;
421 std::string media_stream_requested_video_device_; 438 std::string media_stream_requested_video_device_;
422 439
423 DISALLOW_COPY_AND_ASSIGN(TabSpecificContentSettings); 440 DISALLOW_COPY_AND_ASSIGN(TabSpecificContentSettings);
424 }; 441 };
425 442
426 #endif // CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_ 443 #endif // CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698