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

Side by Side Diff: chrome/browser/ui/website_settings/website_settings.cc

Issue 2171503003: Remove remaining occurences of CONTENT_SETTINGS_TYPE_PUSH_MESSAGING (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove-push-content-setting-2
Patch Set: Remove remaining occurences of CONTENT_SETTINGS_TYPE_PUSH_MESSAGING Created 4 years, 5 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/ui/website_settings/website_settings.h" 5 #include "chrome/browser/ui/website_settings/website_settings.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 }; 94 };
95 95
96 // The list of content settings types to display on the Website Settings UI. THE 96 // The list of content settings types to display on the Website Settings UI. THE
97 // ORDER OF THESE ITEMS IS IMPORTANT. To propose changing it, email 97 // ORDER OF THESE ITEMS IS IMPORTANT. To propose changing it, email
98 // security-dev@chromium.org. 98 // security-dev@chromium.org.
99 ContentSettingsType kPermissionType[] = { 99 ContentSettingsType kPermissionType[] = {
100 CONTENT_SETTINGS_TYPE_GEOLOCATION, 100 CONTENT_SETTINGS_TYPE_GEOLOCATION,
101 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, 101 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,
102 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, 102 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,
103 CONTENT_SETTINGS_TYPE_NOTIFICATIONS, 103 CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
104 #if defined(OS_ANDROID)
105 CONTENT_SETTINGS_TYPE_PUSH_MESSAGING,
106 #endif
107 CONTENT_SETTINGS_TYPE_JAVASCRIPT, 104 CONTENT_SETTINGS_TYPE_JAVASCRIPT,
108 #if !defined(OS_ANDROID) 105 #if !defined(OS_ANDROID)
109 CONTENT_SETTINGS_TYPE_PLUGINS, 106 CONTENT_SETTINGS_TYPE_PLUGINS,
110 CONTENT_SETTINGS_TYPE_IMAGES, 107 CONTENT_SETTINGS_TYPE_IMAGES,
111 #endif 108 #endif
112 CONTENT_SETTINGS_TYPE_POPUPS, 109 CONTENT_SETTINGS_TYPE_POPUPS,
113 CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC, 110 CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC,
114 CONTENT_SETTINGS_TYPE_KEYGEN, 111 CONTENT_SETTINGS_TYPE_KEYGEN,
115 CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, 112 CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS,
116 #if !defined(OS_ANDROID) 113 #if !defined(OS_ANDROID)
(...skipping 646 matching lines...) Expand 10 before | Expand all | Expand 10 after
763 info.connection_status = site_connection_status_; 760 info.connection_status = site_connection_status_;
764 info.connection_status_description = 761 info.connection_status_description =
765 UTF16ToUTF8(site_connection_details_); 762 UTF16ToUTF8(site_connection_details_);
766 info.identity_status = site_identity_status_; 763 info.identity_status = site_identity_status_;
767 info.identity_status_description = 764 info.identity_status_description =
768 UTF16ToUTF8(site_identity_details_); 765 UTF16ToUTF8(site_identity_details_);
769 info.cert_id = cert_id_; 766 info.cert_id = cert_id_;
770 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_; 767 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_;
771 ui_->SetIdentityInfo(info); 768 ui_->SetIdentityInfo(info);
772 } 769 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698