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

Side by Side Diff: chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm

Issue 1412523003: Adding <keygen> Content Setting (UI) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase on core CL. Created 5 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 #import "chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h " 5 #import "chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h "
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/stl_util.h" 9 #include "base/stl_util.h"
10 #include "base/strings/sys_string_conversions.h" 10 #include "base/strings/sys_string_conversions.h"
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 238
239 struct ContentTypeToNibPath { 239 struct ContentTypeToNibPath {
240 ContentSettingsType type; 240 ContentSettingsType type;
241 NSString* path; 241 NSString* path;
242 }; 242 };
243 243
244 const ContentTypeToNibPath kNibPaths[] = { 244 const ContentTypeToNibPath kNibPaths[] = {
245 {CONTENT_SETTINGS_TYPE_COOKIES, @"ContentBlockedCookies"}, 245 {CONTENT_SETTINGS_TYPE_COOKIES, @"ContentBlockedCookies"},
246 {CONTENT_SETTINGS_TYPE_IMAGES, @"ContentBlockedSimple"}, 246 {CONTENT_SETTINGS_TYPE_IMAGES, @"ContentBlockedSimple"},
247 {CONTENT_SETTINGS_TYPE_JAVASCRIPT, @"ContentBlockedSimple"}, 247 {CONTENT_SETTINGS_TYPE_JAVASCRIPT, @"ContentBlockedSimple"},
248 {CONTENT_SETTINGS_TYPE_KEYGEN, @"ContentBlockedSimple"},
248 {CONTENT_SETTINGS_TYPE_PPAPI_BROKER, @"ContentBlockedSimple"}, 249 {CONTENT_SETTINGS_TYPE_PPAPI_BROKER, @"ContentBlockedSimple"},
249 {CONTENT_SETTINGS_TYPE_PLUGINS, @"ContentBlockedPlugins"}, 250 {CONTENT_SETTINGS_TYPE_PLUGINS, @"ContentBlockedPlugins"},
250 {CONTENT_SETTINGS_TYPE_POPUPS, @"ContentBlockedPopups"}, 251 {CONTENT_SETTINGS_TYPE_POPUPS, @"ContentBlockedPopups"},
251 {CONTENT_SETTINGS_TYPE_GEOLOCATION, @"ContentBlockedGeolocation"}, 252 {CONTENT_SETTINGS_TYPE_GEOLOCATION, @"ContentBlockedGeolocation"},
252 {CONTENT_SETTINGS_TYPE_MIXEDSCRIPT, @"ContentBlockedMixedScript"}, 253 {CONTENT_SETTINGS_TYPE_MIXEDSCRIPT, @"ContentBlockedMixedScript"},
253 {CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS, @"ContentProtocolHandlers"}, 254 {CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS, @"ContentProtocolHandlers"},
254 {CONTENT_SETTINGS_TYPE_MEDIASTREAM, @"ContentBlockedMedia"}, 255 {CONTENT_SETTINGS_TYPE_MEDIASTREAM, @"ContentBlockedMedia"},
255 {CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, @"ContentBlockedDownloads"}, 256 {CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, @"ContentBlockedDownloads"},
256 {CONTENT_SETTINGS_TYPE_MIDI_SYSEX, @"ContentBlockedMIDISysEx"}, 257 {CONTENT_SETTINGS_TYPE_MIDI_SYSEX, @"ContentBlockedMIDISysEx"},
257 }; 258 };
(...skipping 571 matching lines...) Expand 10 before | Expand all | Expand 10 after
829 button, base::SysUTF16ToNSString(it->second->model->GetLabelAt(index))); 830 button, base::SysUTF16ToNSString(it->second->model->GetLabelAt(index)));
830 831
831 it->second->model->ExecuteCommand(index, 0); 832 it->second->model->ExecuteCommand(index, 0);
832 } 833 }
833 834
834 - (content_setting_bubble::MediaMenuPartsMap*)mediaMenus { 835 - (content_setting_bubble::MediaMenuPartsMap*)mediaMenus {
835 return &mediaMenus_; 836 return &mediaMenus_;
836 } 837 }
837 838
838 @end // ContentSettingBubbleController 839 @end // ContentSettingBubbleController
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698