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

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

Issue 10826164: Add infobar for PPAPI broker usage. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 4 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/content_settings_default_provider.h" 5 #include "chrome/browser/content_settings/content_settings_default_provider.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 28 matching lines...) Expand all
39 CONTENT_SETTING_BLOCK, // CONTENT_SETTINGS_TYPE_POPUPS 39 CONTENT_SETTING_BLOCK, // CONTENT_SETTINGS_TYPE_POPUPS
40 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_GEOLOCATION 40 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_GEOLOCATION
41 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_NOTIFICATIONS 41 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_NOTIFICATIONS
42 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_INTENTS 42 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_INTENTS
43 CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE 43 CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE
44 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_FULLSCREEN 44 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_FULLSCREEN
45 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MOUSELOCK 45 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MOUSELOCK
46 CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_MIXEDSCRIPT 46 CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_MIXEDSCRIPT
47 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MEDIASTREAM 47 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MEDIASTREAM
48 CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS 48 CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS
49 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_PPAPI_BROKER
49 }; 50 };
50 COMPILE_ASSERT(arraysize(kDefaultSettings) == CONTENT_SETTINGS_NUM_TYPES, 51 COMPILE_ASSERT(arraysize(kDefaultSettings) == CONTENT_SETTINGS_NUM_TYPES,
51 default_settings_incorrect_size); 52 default_settings_incorrect_size);
52 53
53 } // namespace 54 } // namespace
54 55
55 namespace content_settings { 56 namespace content_settings {
56 57
57 namespace { 58 namespace {
58 59
(...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after
385 SetWebsiteSetting( 386 SetWebsiteSetting(
386 ContentSettingsPattern::Wildcard(), 387 ContentSettingsPattern::Wildcard(),
387 ContentSettingsPattern::Wildcard(), 388 ContentSettingsPattern::Wildcard(),
388 CONTENT_SETTINGS_TYPE_GEOLOCATION, 389 CONTENT_SETTINGS_TYPE_GEOLOCATION,
389 std::string(), 390 std::string(),
390 value->DeepCopy()); 391 value->DeepCopy());
391 } 392 }
392 } 393 }
393 394
394 } // namespace content_settings 395 } // namespace content_settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698