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

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

Issue 369703002: Remember user decisions on invalid certificates behind a flag (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed broken include Created 6 years, 4 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 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 nib content settings support 284 // TODO(miguelg): Remove this nib content settings support
285 // is implemented 285 // is implemented
286 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING: 286 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING:
287 case CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS:
287 NOTREACHED(); 288 NOTREACHED();
288 } 289 }
289 if ((self = [super initWithWindowNibPath:nibPath 290 if ((self = [super initWithWindowNibPath:nibPath
290 parentWindow:parentWindow 291 parentWindow:parentWindow
291 anchoredAt:anchoredAt])) { 292 anchoredAt:anchoredAt])) {
292 contentSettingBubbleModel_.reset(model.release()); 293 contentSettingBubbleModel_.reset(model.release());
293 [self showWindow:nil]; 294 [self showWindow:nil];
294 } 295 }
295 return self; 296 return self;
296 } 297 }
(...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after
817 button, base::SysUTF16ToNSString(it->second->model->GetLabelAt(index))); 818 button, base::SysUTF16ToNSString(it->second->model->GetLabelAt(index)));
818 819
819 it->second->model->ExecuteCommand(index, 0); 820 it->second->model->ExecuteCommand(index, 0);
820 } 821 }
821 822
822 - (content_setting_bubble::MediaMenuPartsMap*)mediaMenus { 823 - (content_setting_bubble::MediaMenuPartsMap*)mediaMenus {
823 return &mediaMenus_; 824 return &mediaMenus_;
824 } 825 }
825 826
826 @end // ContentSettingBubbleController 827 @end // ContentSettingBubbleController
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698