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

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

Issue 27635002: Content settings for <audio> and <video>. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Test fix. Created 6 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 #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 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 observerBridge_.reset( 247 observerBridge_.reset(
248 new ContentSettingBubbleWebContentsObserverBridge(webContents, self)); 248 new ContentSettingBubbleWebContentsObserverBridge(webContents, self));
249 249
250 ContentSettingsType settingsType = model->content_type(); 250 ContentSettingsType settingsType = model->content_type();
251 NSString* nibPath = @""; 251 NSString* nibPath = @"";
252 switch (settingsType) { 252 switch (settingsType) {
253 case CONTENT_SETTINGS_TYPE_COOKIES: 253 case CONTENT_SETTINGS_TYPE_COOKIES:
254 nibPath = @"ContentBlockedCookies"; break; 254 nibPath = @"ContentBlockedCookies"; break;
255 case CONTENT_SETTINGS_TYPE_IMAGES: 255 case CONTENT_SETTINGS_TYPE_IMAGES:
256 case CONTENT_SETTINGS_TYPE_JAVASCRIPT: 256 case CONTENT_SETTINGS_TYPE_JAVASCRIPT:
257 case CONTENT_SETTINGS_TYPE_MEDIA:
257 case CONTENT_SETTINGS_TYPE_PPAPI_BROKER: 258 case CONTENT_SETTINGS_TYPE_PPAPI_BROKER:
258 nibPath = @"ContentBlockedSimple"; break; 259 nibPath = @"ContentBlockedSimple"; break;
259 case CONTENT_SETTINGS_TYPE_PLUGINS: 260 case CONTENT_SETTINGS_TYPE_PLUGINS:
260 nibPath = @"ContentBlockedPlugins"; break; 261 nibPath = @"ContentBlockedPlugins"; break;
261 case CONTENT_SETTINGS_TYPE_POPUPS: 262 case CONTENT_SETTINGS_TYPE_POPUPS:
262 nibPath = @"ContentBlockedPopups"; break; 263 nibPath = @"ContentBlockedPopups"; break;
263 case CONTENT_SETTINGS_TYPE_GEOLOCATION: 264 case CONTENT_SETTINGS_TYPE_GEOLOCATION:
264 nibPath = @"ContentBlockedGeolocation"; break; 265 nibPath = @"ContentBlockedGeolocation"; break;
265 case CONTENT_SETTINGS_TYPE_MIXEDSCRIPT: 266 case CONTENT_SETTINGS_TYPE_MIXEDSCRIPT:
266 nibPath = @"ContentBlockedMixedScript"; break; 267 nibPath = @"ContentBlockedMixedScript"; break;
(...skipping 549 matching lines...) Expand 10 before | Expand all | Expand 10 after
816 button, base::SysUTF16ToNSString(it->second->model->GetLabelAt(index))); 817 button, base::SysUTF16ToNSString(it->second->model->GetLabelAt(index)));
817 818
818 it->second->model->ExecuteCommand(index, 0); 819 it->second->model->ExecuteCommand(index, 0);
819 } 820 }
820 821
821 - (content_setting_bubble::MediaMenuPartsMap*)mediaMenus { 822 - (content_setting_bubble::MediaMenuPartsMap*)mediaMenus {
822 return &mediaMenus_; 823 return &mediaMenus_;
823 } 824 }
824 825
825 @end // ContentSettingBubbleController 826 @end // ContentSettingBubbleController
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698