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

Side by Side Diff: chrome/browser/ui/website_settings/website_settings_ui.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, 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
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_ui.h" 5 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "chrome/grit/chromium_strings.h" 8 #include "chrome/grit/chromium_strings.h"
9 #include "chrome/grit/generated_resources.h" 9 #include "chrome/grit/generated_resources.h"
10 #include "components/content_settings/core/browser/plugins_field_trial.h" 10 #include "components/content_settings/core/browser/plugins_field_trial.h"
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 IDR_BLOCKED_POPUPS, IDR_ALLOWED_POPUPS}, 89 IDR_BLOCKED_POPUPS, IDR_ALLOWED_POPUPS},
90 #if defined(ENABLE_PLUGINS) 90 #if defined(ENABLE_PLUGINS)
91 {CONTENT_SETTINGS_TYPE_PLUGINS, IDS_WEBSITE_SETTINGS_TYPE_PLUGINS, 91 {CONTENT_SETTINGS_TYPE_PLUGINS, IDS_WEBSITE_SETTINGS_TYPE_PLUGINS,
92 IDR_BLOCKED_POPUPS, IDR_ALLOWED_PLUGINS}, 92 IDR_BLOCKED_POPUPS, IDR_ALLOWED_PLUGINS},
93 #endif 93 #endif
94 {CONTENT_SETTINGS_TYPE_GEOLOCATION, IDS_WEBSITE_SETTINGS_TYPE_LOCATION, 94 {CONTENT_SETTINGS_TYPE_GEOLOCATION, IDS_WEBSITE_SETTINGS_TYPE_LOCATION,
95 IDR_BLOCKED_LOCATION, IDR_ALLOWED_LOCATION}, 95 IDR_BLOCKED_LOCATION, IDR_ALLOWED_LOCATION},
96 {CONTENT_SETTINGS_TYPE_NOTIFICATIONS, 96 {CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
97 IDS_WEBSITE_SETTINGS_TYPE_NOTIFICATIONS, IDR_BLOCKED_NOTIFICATION, 97 IDS_WEBSITE_SETTINGS_TYPE_NOTIFICATIONS, IDR_BLOCKED_NOTIFICATION,
98 IDR_ALLOWED_NOTIFICATION}, 98 IDR_ALLOWED_NOTIFICATION},
99 {CONTENT_SETTINGS_TYPE_PUSH_MESSAGING,
100 IDS_WEBSITE_SETTINGS_TYPE_NOTIFICATIONS, 0, 0},
101 {CONTENT_SETTINGS_TYPE_FULLSCREEN, IDS_WEBSITE_SETTINGS_TYPE_FULLSCREEN, 99 {CONTENT_SETTINGS_TYPE_FULLSCREEN, IDS_WEBSITE_SETTINGS_TYPE_FULLSCREEN,
102 IDR_ALLOWED_FULLSCREEN, IDR_ALLOWED_FULLSCREEN}, 100 IDR_ALLOWED_FULLSCREEN, IDR_ALLOWED_FULLSCREEN},
103 {CONTENT_SETTINGS_TYPE_MOUSELOCK, IDS_WEBSITE_SETTINGS_TYPE_MOUSELOCK, 101 {CONTENT_SETTINGS_TYPE_MOUSELOCK, IDS_WEBSITE_SETTINGS_TYPE_MOUSELOCK,
104 IDR_BLOCKED_MOUSE_CURSOR, IDR_ALLOWED_MOUSE_CURSOR}, 102 IDR_BLOCKED_MOUSE_CURSOR, IDR_ALLOWED_MOUSE_CURSOR},
105 {CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, IDS_WEBSITE_SETTINGS_TYPE_MIC, 103 {CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, IDS_WEBSITE_SETTINGS_TYPE_MIC,
106 IDR_BLOCKED_MIC, IDR_ALLOWED_MIC}, 104 IDR_BLOCKED_MIC, IDR_ALLOWED_MIC},
107 {CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, IDS_WEBSITE_SETTINGS_TYPE_CAMERA, 105 {CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, IDS_WEBSITE_SETTINGS_TYPE_CAMERA,
108 IDR_BLOCKED_CAMERA, IDR_ALLOWED_CAMERA}, 106 IDR_BLOCKED_CAMERA, IDR_ALLOWED_CAMERA},
109 {CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, 107 {CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS,
110 IDS_AUTOMATIC_DOWNLOADS_TAB_LABEL, IDR_BLOCKED_DOWNLOADS, 108 IDS_AUTOMATIC_DOWNLOADS_TAB_LABEL, IDR_BLOCKED_DOWNLOADS,
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 } 363 }
366 return resource_id; 364 return resource_id;
367 } 365 }
368 366
369 // static 367 // static
370 const gfx::Image& WebsiteSettingsUI::GetConnectionIcon( 368 const gfx::Image& WebsiteSettingsUI::GetConnectionIcon(
371 WebsiteSettings::SiteConnectionStatus status) { 369 WebsiteSettings::SiteConnectionStatus status) {
372 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 370 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
373 return rb.GetNativeImageNamed(GetConnectionIconID(status)); 371 return rb.GetNativeImageNamed(GetConnectionIconID(status));
374 } 372 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/website_settings/website_settings.cc ('k') | chrome/browser/ui/webui/options/content_settings_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698