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

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

Issue 7740044: Implement fullscreen info bubble on Win and Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: respond to commens Created 9 years, 2 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 21 matching lines...) Expand all
32 const ContentSetting kDefaultSettings[] = { 32 const ContentSetting kDefaultSettings[] = {
33 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_COOKIES 33 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_COOKIES
34 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_IMAGES 34 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_IMAGES
35 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_JAVASCRIPT 35 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_JAVASCRIPT
36 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_PLUGINS 36 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_PLUGINS
37 CONTENT_SETTING_BLOCK, // CONTENT_SETTINGS_TYPE_POPUPS 37 CONTENT_SETTING_BLOCK, // CONTENT_SETTINGS_TYPE_POPUPS
38 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_GEOLOCATION 38 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_GEOLOCATION
39 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_NOTIFICATIONS 39 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_NOTIFICATIONS
40 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_INTENTS 40 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_INTENTS
41 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE 41 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE
42 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_FULLSCREEN
42 }; 43 };
43 COMPILE_ASSERT(arraysize(kDefaultSettings) == CONTENT_SETTINGS_NUM_TYPES, 44 COMPILE_ASSERT(arraysize(kDefaultSettings) == CONTENT_SETTINGS_NUM_TYPES,
44 default_settings_incorrect_size); 45 default_settings_incorrect_size);
45 46
46 } // namespace 47 } // namespace
47 48
48 namespace content_settings { 49 namespace content_settings {
49 50
50 // static 51 // static
51 void DefaultProvider::RegisterUserPrefs(PrefService* prefs) { 52 void DefaultProvider::RegisterUserPrefs(PrefService* prefs) {
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 SetContentSetting( 312 SetContentSetting(
312 ContentSettingsPattern::Wildcard(), 313 ContentSettingsPattern::Wildcard(),
313 ContentSettingsPattern::Wildcard(), 314 ContentSettingsPattern::Wildcard(),
314 CONTENT_SETTINGS_TYPE_GEOLOCATION, 315 CONTENT_SETTINGS_TYPE_GEOLOCATION,
315 std::string(), 316 std::string(),
316 setting); 317 setting);
317 } 318 }
318 } 319 }
319 320
320 } // namespace 321 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698