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

Side by Side Diff: chrome/browser/content_settings/host_content_settings_map.cc

Issue 10826164: Add infobar for PPAPI broker usage. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync Created 8 years, 3 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 | Annotate | Revision Log
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 #include "chrome/browser/content_settings/host_content_settings_map.h" 5 #include "chrome/browser/content_settings/host_content_settings_map.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 } 353 }
354 switch (content_type) { 354 switch (content_type) {
355 case CONTENT_SETTINGS_TYPE_COOKIES: 355 case CONTENT_SETTINGS_TYPE_COOKIES:
356 return setting == CONTENT_SETTING_SESSION_ONLY; 356 return setting == CONTENT_SETTING_SESSION_ONLY;
357 case CONTENT_SETTINGS_TYPE_PLUGINS: 357 case CONTENT_SETTINGS_TYPE_PLUGINS:
358 case CONTENT_SETTINGS_TYPE_GEOLOCATION: 358 case CONTENT_SETTINGS_TYPE_GEOLOCATION:
359 case CONTENT_SETTINGS_TYPE_NOTIFICATIONS: 359 case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
360 case CONTENT_SETTINGS_TYPE_INTENTS: 360 case CONTENT_SETTINGS_TYPE_INTENTS:
361 case CONTENT_SETTINGS_TYPE_MOUSELOCK: 361 case CONTENT_SETTINGS_TYPE_MOUSELOCK:
362 case CONTENT_SETTINGS_TYPE_MEDIASTREAM: 362 case CONTENT_SETTINGS_TYPE_MEDIASTREAM:
363 case CONTENT_SETTINGS_TYPE_PPAPI_BROKER:
363 return setting == CONTENT_SETTING_ASK; 364 return setting == CONTENT_SETTING_ASK;
364 default: 365 default:
365 return false; 366 return false;
366 } 367 }
367 } 368 }
368 369
369 // static 370 // static
370 bool HostContentSettingsMap::ContentTypeHasCompoundValue( 371 bool HostContentSettingsMap::ContentTypeHasCompoundValue(
371 ContentSettingsType type) { 372 ContentSettingsType type) {
372 // Values for content type CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE are 373 // Values for content type CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE are
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
556 } 557 }
557 } 558 }
558 559
559 if (info) { 560 if (info) {
560 info->source = content_settings::SETTING_SOURCE_NONE; 561 info->source = content_settings::SETTING_SOURCE_NONE;
561 info->primary_pattern = ContentSettingsPattern(); 562 info->primary_pattern = ContentSettingsPattern();
562 info->secondary_pattern = ContentSettingsPattern(); 563 info->secondary_pattern = ContentSettingsPattern();
563 } 564 }
564 return NULL; 565 return NULL;
565 } 566 }
OLDNEW
« no previous file with comments | « chrome/browser/content_settings/content_settings_utils.cc ('k') | chrome/browser/pepper_broker_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698