OLD | NEW |
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 Loading... |
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: |
284 NOTREACHED(); | 286 NOTREACHED(); |
285 } | 287 } |
286 if ((self = [super initWithWindowNibPath:nibPath | 288 if ((self = [super initWithWindowNibPath:nibPath |
287 parentWindow:parentWindow | 289 parentWindow:parentWindow |
288 anchoredAt:anchoredAt])) { | 290 anchoredAt:anchoredAt])) { |
289 contentSettingBubbleModel_.reset(model.release()); | 291 contentSettingBubbleModel_.reset(model.release()); |
290 [self showWindow:nil]; | 292 [self showWindow:nil]; |
291 } | 293 } |
292 return self; | 294 return self; |
293 } | 295 } |
(...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
814 button, base::SysUTF16ToNSString(it->second->model->GetLabelAt(index))); | 816 button, base::SysUTF16ToNSString(it->second->model->GetLabelAt(index))); |
815 | 817 |
816 it->second->model->ExecuteCommand(index, 0); | 818 it->second->model->ExecuteCommand(index, 0); |
817 } | 819 } |
818 | 820 |
819 - (content_setting_bubble::MediaMenuPartsMap*)mediaMenus { | 821 - (content_setting_bubble::MediaMenuPartsMap*)mediaMenus { |
820 return &mediaMenus_; | 822 return &mediaMenus_; |
821 } | 823 } |
822 | 824 |
823 @end // ContentSettingBubbleController | 825 @end // ContentSettingBubbleController |
OLD | NEW |