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

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

Issue 365123003: Implement midi permissions on top of the new common permission classes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | Annotate | Revision Log
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 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 nibPath = @"ContentBlockedMIDISysEx"; break; 274 nibPath = @"ContentBlockedMIDISysEx"; break;
275 // These content types have no bubble: 275 // These content types have no bubble:
276 case CONTENT_SETTINGS_TYPE_DEFAULT: 276 case CONTENT_SETTINGS_TYPE_DEFAULT:
277 case CONTENT_SETTINGS_TYPE_NOTIFICATIONS: 277 case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
278 case CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE: 278 case CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE:
279 case CONTENT_SETTINGS_TYPE_FULLSCREEN: 279 case CONTENT_SETTINGS_TYPE_FULLSCREEN:
280 case CONTENT_SETTINGS_TYPE_MOUSELOCK: 280 case CONTENT_SETTINGS_TYPE_MOUSELOCK:
281 case CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC: 281 case CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC:
282 case CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA: 282 case CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA:
283 case CONTENT_SETTINGS_NUM_TYPES: 283 case CONTENT_SETTINGS_NUM_TYPES:
284 // TODO(miguelg): Remove this when bubble support is implemented
285 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING:
286 NOTREACHED();
287 } 284 }
288 if ((self = [super initWithWindowNibPath:nibPath 285 if ((self = [super initWithWindowNibPath:nibPath
289 parentWindow:parentWindow 286 parentWindow:parentWindow
290 anchoredAt:anchoredAt])) { 287 anchoredAt:anchoredAt])) {
291 contentSettingBubbleModel_.reset(model.release()); 288 contentSettingBubbleModel_.reset(model.release());
292 [self showWindow:nil]; 289 [self showWindow:nil];
293 } 290 }
294 return self; 291 return self;
295 } 292 }
296 293
(...skipping 519 matching lines...) Expand 10 before | Expand all | Expand 10 after
816 button, base::SysUTF16ToNSString(it->second->model->GetLabelAt(index))); 813 button, base::SysUTF16ToNSString(it->second->model->GetLabelAt(index)));
817 814
818 it->second->model->ExecuteCommand(index, 0); 815 it->second->model->ExecuteCommand(index, 0);
819 } 816 }
820 817
821 - (content_setting_bubble::MediaMenuPartsMap*)mediaMenus { 818 - (content_setting_bubble::MediaMenuPartsMap*)mediaMenus {
822 return &mediaMenus_; 819 return &mediaMenus_;
823 } 820 }
824 821
825 @end // ContentSettingBubbleController 822 @end // ContentSettingBubbleController
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698