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

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

Issue 10584042: Bring up a content settings icon for ungestured registerProtocolHandler call. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | 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 25 matching lines...) Expand all
36 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_IMAGES 36 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_IMAGES
37 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_JAVASCRIPT 37 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_JAVASCRIPT
38 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_PLUGINS 38 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_PLUGINS
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_ASK, // CONTENT_SETTINGS_TYPE_REGISTER_PROTOCOL_HANDLER
46 }; 47 };
47 COMPILE_ASSERT(arraysize(kDefaultSettings) == CONTENT_SETTINGS_NUM_TYPES, 48 COMPILE_ASSERT(arraysize(kDefaultSettings) == CONTENT_SETTINGS_NUM_TYPES,
48 default_settings_incorrect_size); 49 default_settings_incorrect_size);
49 50
50 } // namespace 51 } // namespace
51 52
52 namespace content_settings { 53 namespace content_settings {
53 54
54 namespace { 55 namespace {
55 56
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 SetWebsiteSetting( 378 SetWebsiteSetting(
378 ContentSettingsPattern::Wildcard(), 379 ContentSettingsPattern::Wildcard(),
379 ContentSettingsPattern::Wildcard(), 380 ContentSettingsPattern::Wildcard(),
380 CONTENT_SETTINGS_TYPE_GEOLOCATION, 381 CONTENT_SETTINGS_TYPE_GEOLOCATION,
381 std::string(), 382 std::string(),
382 value->DeepCopy()); 383 value->DeepCopy());
383 } 384 }
384 } 385 }
385 386
386 } // namespace content_settings 387 } // namespace content_settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698