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

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

Issue 884373002: Update content setting for app banners to store more information. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Mac test failure Created 5 years, 10 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 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 case CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS:
288 case CONTENT_SETTINGS_TYPE_APP_BANNER:
288 NOTREACHED(); 289 NOTREACHED();
289 } 290 }
290 if ((self = [super initWithWindowNibPath:nibPath 291 if ((self = [super initWithWindowNibPath:nibPath
291 parentWindow:parentWindow 292 parentWindow:parentWindow
292 anchoredAt:anchoredAt])) { 293 anchoredAt:anchoredAt])) {
293 contentSettingBubbleModel_.reset(model.release()); 294 contentSettingBubbleModel_.reset(model.release());
294 [self showWindow:nil]; 295 [self showWindow:nil];
295 } 296 }
296 return self; 297 return self;
297 } 298 }
(...skipping 517 matching lines...) Expand 10 before | Expand all | Expand 10 after
815 button, base::SysUTF16ToNSString(it->second->model->GetLabelAt(index))); 816 button, base::SysUTF16ToNSString(it->second->model->GetLabelAt(index)));
816 817
817 it->second->model->ExecuteCommand(index, 0); 818 it->second->model->ExecuteCommand(index, 0);
818 } 819 }
819 820
820 - (content_setting_bubble::MediaMenuPartsMap*)mediaMenus { 821 - (content_setting_bubble::MediaMenuPartsMap*)mediaMenus {
821 return &mediaMenus_; 822 return &mediaMenus_;
822 } 823 }
823 824
824 @end // ContentSettingBubbleController 825 @end // ContentSettingBubbleController
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698