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

Side by Side Diff: chrome/browser/extensions/api/content_settings/content_settings_helpers.cc

Issue 933273002: Revert of Expose camera settings to the extensions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 #include "chrome/browser/extensions/api/content_settings/content_settings_helper s.h" 5 #include "chrome/browser/extensions/api/content_settings/content_settings_helper s.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "content/public/common/url_constants.h" 10 #include "content/public/common/url_constants.h"
(...skipping 12 matching lines...) Expand all
23 "javascript", 23 "javascript",
24 "plugins", 24 "plugins",
25 "popups", 25 "popups",
26 "location", 26 "location",
27 "notifications", 27 "notifications",
28 "auto-select-certificate", 28 "auto-select-certificate",
29 "fullscreen", 29 "fullscreen",
30 "mouselock", 30 "mouselock",
31 "mixed-script", 31 "mixed-script",
32 "media-stream", 32 "media-stream",
33 "media-stream-mic", 33 "media-stream-mic"
34 "media-stream-camera"
35 }; 34 };
36 35
37 // TODO(msramek): Assert that |kContentSettingsTypeNames| is synced with 36 // TODO(msramek): Assert that |kContentSettingsTypeNames| is synced with
38 // enum |ContentSettingsType|. 37 // enum |ContentSettingsType|.
39 static_assert(arraysize(kContentSettingsTypeNames) <= 38 static_assert(arraysize(kContentSettingsTypeNames) <=
40 CONTENT_SETTINGS_NUM_TYPES, 39 CONTENT_SETTINGS_NUM_TYPES,
41 "kContentSettingsTypeNames has an unexpected number of elements"); 40 "kContentSettingsTypeNames has an unexpected number of elements");
42 41
43 const char* const kContentSettingNames[] = { 42 const char* const kContentSettingNames[] = {
44 "default", 43 "default",
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 } 149 }
151 150
152 const char* ContentSettingToString(ContentSetting setting) { 151 const char* ContentSettingToString(ContentSetting setting) {
153 size_t index = static_cast<size_t>(setting); 152 size_t index = static_cast<size_t>(setting);
154 DCHECK_LT(index, arraysize(kContentSettingNames)); 153 DCHECK_LT(index, arraysize(kContentSettingNames));
155 return kContentSettingNames[index]; 154 return kContentSettingNames[index];
156 } 155 }
157 156
158 } // namespace content_settings_helpers 157 } // namespace content_settings_helpers
159 } // namespace extensions 158 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698