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

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 indentation and style issues 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
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 {
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 407
399 // The previous protocol handler to be replaced by 408 // The previous protocol handler to be replaced by
400 // the pending_protocol_handler_, if there is one. Empty if 409 // the pending_protocol_handler_, if there is one. Empty if
401 // there is no handler which would be replaced. 410 // there is no handler which would be replaced.
402 ProtocolHandler previous_protocol_handler_; 411 ProtocolHandler previous_protocol_handler_;
403 412
404 // The setting on the pending protocol handler registration. Persisted in case 413 // The setting on the pending protocol handler registration. Persisted in case
405 // the user opens the bubble and makes changes multiple times. 414 // the user opens the bubble and makes changes multiple times.
406 ContentSetting pending_protocol_handler_setting_; 415 ContentSetting pending_protocol_handler_setting_;
407 416
417 // The setting on the plugin bubble model. Persisted in case
418 // the user opens the bubble and makes changes multiple times.
419 ContentSetting plugin_bubble_setting_;
420
408 // Stores whether the user can load blocked plugins on this page. 421 // Stores whether the user can load blocked plugins on this page.
409 bool load_plugins_link_enabled_; 422 bool load_plugins_link_enabled_;
410 423
411 content::NotificationRegistrar registrar_; 424 content::NotificationRegistrar registrar_;
412 425
413 // The origin of the media stream request. Note that we only support handling 426 // 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 427 // settings for one request per tab. The latest request's origin will be
415 // stored here. http://crbug.com/259794 428 // stored here. http://crbug.com/259794
416 GURL media_stream_access_origin_; 429 GURL media_stream_access_origin_;
417 430
418 // The devices to be displayed in the media bubble when the media stream 431 // The devices to be displayed in the media bubble when the media stream
419 // request is requesting certain specific devices. 432 // request is requesting certain specific devices.
420 std::string media_stream_requested_audio_device_; 433 std::string media_stream_requested_audio_device_;
421 std::string media_stream_requested_video_device_; 434 std::string media_stream_requested_video_device_;
422 435
423 DISALLOW_COPY_AND_ASSIGN(TabSpecificContentSettings); 436 DISALLOW_COPY_AND_ASSIGN(TabSpecificContentSettings);
424 }; 437 };
425 438
426 #endif // CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_ 439 #endif // CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698