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

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

Issue 2419413002: Deleted CONTENT_SETTINGS_TYPE_FULLSCREEN and MOUSELOCK. (Closed)
Patch Set: Fix more things. Created 4 years, 1 month 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/browser/content_settings/host_content_settings_map_factory.h" 8 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
9 #include "chrome/browser/plugins/plugin_utils.h" 9 #include "chrome/browser/plugins/plugin_utils.h"
10 #include "chrome/browser/plugins/plugins_field_trial.h" 10 #include "chrome/browser/plugins/plugins_field_trial.h"
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 IDR_BLOCKED_POPUPS, IDR_ALLOWED_POPUPS}, 92 IDR_BLOCKED_POPUPS, IDR_ALLOWED_POPUPS},
93 #if defined(ENABLE_PLUGINS) 93 #if defined(ENABLE_PLUGINS)
94 {CONTENT_SETTINGS_TYPE_PLUGINS, IDS_WEBSITE_SETTINGS_TYPE_FLASH, 94 {CONTENT_SETTINGS_TYPE_PLUGINS, IDS_WEBSITE_SETTINGS_TYPE_FLASH,
95 IDR_BLOCKED_PLUGINS, IDR_ALLOWED_PLUGINS}, 95 IDR_BLOCKED_PLUGINS, IDR_ALLOWED_PLUGINS},
96 #endif 96 #endif
97 {CONTENT_SETTINGS_TYPE_GEOLOCATION, IDS_WEBSITE_SETTINGS_TYPE_LOCATION, 97 {CONTENT_SETTINGS_TYPE_GEOLOCATION, IDS_WEBSITE_SETTINGS_TYPE_LOCATION,
98 IDR_BLOCKED_LOCATION, IDR_ALLOWED_LOCATION}, 98 IDR_BLOCKED_LOCATION, IDR_ALLOWED_LOCATION},
99 {CONTENT_SETTINGS_TYPE_NOTIFICATIONS, 99 {CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
100 IDS_WEBSITE_SETTINGS_TYPE_NOTIFICATIONS, IDR_BLOCKED_NOTIFICATION, 100 IDS_WEBSITE_SETTINGS_TYPE_NOTIFICATIONS, IDR_BLOCKED_NOTIFICATION,
101 IDR_ALLOWED_NOTIFICATION}, 101 IDR_ALLOWED_NOTIFICATION},
102 {CONTENT_SETTINGS_TYPE_FULLSCREEN, IDS_WEBSITE_SETTINGS_TYPE_FULLSCREEN,
103 IDR_ALLOWED_FULLSCREEN, IDR_ALLOWED_FULLSCREEN},
104 {CONTENT_SETTINGS_TYPE_MOUSELOCK, IDS_WEBSITE_SETTINGS_TYPE_MOUSELOCK,
105 IDR_BLOCKED_MOUSE_CURSOR, IDR_ALLOWED_MOUSE_CURSOR},
106 {CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, IDS_WEBSITE_SETTINGS_TYPE_MIC, 102 {CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, IDS_WEBSITE_SETTINGS_TYPE_MIC,
107 IDR_BLOCKED_MIC, IDR_ALLOWED_MIC}, 103 IDR_BLOCKED_MIC, IDR_ALLOWED_MIC},
108 {CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, IDS_WEBSITE_SETTINGS_TYPE_CAMERA, 104 {CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, IDS_WEBSITE_SETTINGS_TYPE_CAMERA,
109 IDR_BLOCKED_CAMERA, IDR_ALLOWED_CAMERA}, 105 IDR_BLOCKED_CAMERA, IDR_ALLOWED_CAMERA},
110 {CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, 106 {CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS,
111 IDS_AUTOMATIC_DOWNLOADS_TAB_LABEL, IDR_BLOCKED_DOWNLOADS, 107 IDS_AUTOMATIC_DOWNLOADS_TAB_LABEL, IDR_BLOCKED_DOWNLOADS,
112 IDR_ALLOWED_DOWNLOADS}, 108 IDR_ALLOWED_DOWNLOADS},
113 {CONTENT_SETTINGS_TYPE_MIDI_SYSEX, IDS_WEBSITE_SETTINGS_TYPE_MIDI_SYSEX, 109 {CONTENT_SETTINGS_TYPE_MIDI_SYSEX, IDS_WEBSITE_SETTINGS_TYPE_MIDI_SYSEX,
114 IDR_BLOCKED_MIDI_SYSEX, IDR_ALLOWED_MIDI_SYSEX}, 110 IDR_BLOCKED_MIDI_SYSEX, IDR_ALLOWED_MIDI_SYSEX},
115 {CONTENT_SETTINGS_TYPE_KEYGEN, IDS_WEBSITE_SETTINGS_TYPE_KEYGEN, 111 {CONTENT_SETTINGS_TYPE_KEYGEN, IDS_WEBSITE_SETTINGS_TYPE_KEYGEN,
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 } 386 }
391 return resource_id; 387 return resource_id;
392 } 388 }
393 389
394 // static 390 // static
395 const gfx::Image& WebsiteSettingsUI::GetConnectionIcon( 391 const gfx::Image& WebsiteSettingsUI::GetConnectionIcon(
396 WebsiteSettings::SiteConnectionStatus status) { 392 WebsiteSettings::SiteConnectionStatus status) {
397 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 393 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
398 return rb.GetNativeImageNamed(GetConnectionIconID(status)); 394 return rb.GetNativeImageNamed(GetConnectionIconID(status));
399 } 395 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698