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

Side by Side Diff: chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.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 #import <Cocoa/Cocoa.h> 7 #import <Cocoa/Cocoa.h>
8 8
9 #include "base/mac/scoped_nsautorelease_pool.h" 9 #include "base/mac/scoped_nsautorelease_pool.h"
10 #include "base/mac/scoped_nsobject.h" 10 #include "base/mac/scoped_nsobject.h"
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 if (i == CONTENT_SETTINGS_TYPE_NOTIFICATIONS || 106 if (i == CONTENT_SETTINGS_TYPE_NOTIFICATIONS ||
107 i == CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE || 107 i == CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE ||
108 i == CONTENT_SETTINGS_TYPE_FULLSCREEN || 108 i == CONTENT_SETTINGS_TYPE_FULLSCREEN ||
109 i == CONTENT_SETTINGS_TYPE_MOUSELOCK || 109 i == CONTENT_SETTINGS_TYPE_MOUSELOCK ||
110 i == CONTENT_SETTINGS_TYPE_MEDIASTREAM || 110 i == CONTENT_SETTINGS_TYPE_MEDIASTREAM ||
111 i == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC || 111 i == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC ||
112 i == CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA || 112 i == CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA ||
113 i == CONTENT_SETTINGS_TYPE_PPAPI_BROKER || 113 i == CONTENT_SETTINGS_TYPE_PPAPI_BROKER ||
114 i == CONTENT_SETTINGS_TYPE_MIDI_SYSEX || 114 i == CONTENT_SETTINGS_TYPE_MIDI_SYSEX ||
115 i == CONTENT_SETTINGS_TYPE_PUSH_MESSAGING || 115 i == CONTENT_SETTINGS_TYPE_PUSH_MESSAGING ||
116 i == CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS) { 116 i == CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS ||
117 i == CONTENT_SETTINGS_TYPE_APP_BANNER) {
117 // These types have no bubble. 118 // These types have no bubble.
118 continue; 119 continue;
119 } 120 }
120 121
121 ContentSettingsType settingsType = static_cast<ContentSettingsType>(i); 122 ContentSettingsType settingsType = static_cast<ContentSettingsType>(i);
122 123
123 ContentSettingBubbleController* controller = 124 ContentSettingBubbleController* controller =
124 CreateBubbleController(settingsType); 125 CreateBubbleController(settingsType);
125 EXPECT_EQ(0u, [controller mediaMenus]->size()); 126 EXPECT_EQ(0u, [controller mediaMenus]->size());
126 [parent_ close]; 127 [parent_ close];
(...skipping 16 matching lines...) Expand all
143 (content::MEDIA_DEVICE_VIDEO_CAPTURE == i->second->type)); 144 (content::MEDIA_DEVICE_VIDEO_CAPTURE == i->second->type));
144 EXPECT_EQ(0, [i->first numberOfItems]); 145 EXPECT_EQ(0, [i->first numberOfItems]);
145 EXPECT_NSEQ(title, [i->first title]); 146 EXPECT_NSEQ(title, [i->first title]);
146 EXPECT_FALSE([i->first isEnabled]); 147 EXPECT_FALSE([i->first isEnabled]);
147 } 148 }
148 149
149 [parent_ close]; 150 [parent_ close];
150 } 151 }
151 152
152 } // namespace 153 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698