OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/website_settings/website_settings_bubble_contro
ller.h" | 5 #import "chrome/browser/ui/cocoa/website_settings/website_settings_bubble_contro
ller.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include "base/i18n/rtl.h" | 9 #include "base/i18n/rtl.h" |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
217 // - [allow, block, ask] by default | 217 // - [allow, block, ask] by default |
218 // - [block, allow] * [by user, by policy, by extension] | 218 // - [block, allow] * [by user, by policy, by extension] |
219 PermissionInfoList permission_info_list; | 219 PermissionInfoList permission_info_list; |
220 WebsiteSettingsUI::PermissionInfo info; | 220 WebsiteSettingsUI::PermissionInfo info; |
221 for (size_t i = 0; i < arraysize(kTestPermissionTypes); ++i) { | 221 for (size_t i = 0; i < arraysize(kTestPermissionTypes); ++i) { |
222 info.type = kTestPermissionTypes[i]; | 222 info.type = kTestPermissionTypes[i]; |
223 info.setting = kTestSettings[i]; | 223 info.setting = kTestSettings[i]; |
224 if (info.setting == CONTENT_SETTING_DEFAULT) | 224 if (info.setting == CONTENT_SETTING_DEFAULT) |
225 info.default_setting = kTestDefaultSettings[i]; | 225 info.default_setting = kTestDefaultSettings[i]; |
226 info.source = kTestSettingSources[i]; | 226 info.source = kTestSettingSources[i]; |
| 227 info.is_incognito = false; |
227 permission_info_list.push_back(info); | 228 permission_info_list.push_back(info); |
228 } | 229 } |
229 ChosenObjectInfoList chosen_object_info_list; | 230 ChosenObjectInfoList chosen_object_info_list; |
230 bridge_->SetPermissionInfo(permission_info_list, chosen_object_info_list); | 231 bridge_->SetPermissionInfo(permission_info_list, chosen_object_info_list); |
231 } | 232 } |
232 | 233 |
233 WebsiteSettingsBubbleControllerForTesting* controller_; // Weak, owns self. | 234 WebsiteSettingsBubbleControllerForTesting* controller_; // Weak, owns self. |
234 NSWindow* window_; // Weak, owned by controller. | 235 NSWindow* window_; // Weak, owned by controller. |
235 }; | 236 }; |
236 | 237 |
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
407 } | 408 } |
408 if ([view isKindOfClass:[NSPopUpButton class]]) { | 409 if ([view isKindOfClass:[NSPopUpButton class]]) { |
409 NSPopUpButton* button = static_cast<NSPopUpButton*>(view); | 410 NSPopUpButton* button = static_cast<NSPopUpButton*>(view); |
410 EXPECT_LT(NSMaxX([button frame]), window_width); | 411 EXPECT_LT(NSMaxX([button frame]), window_width); |
411 } | 412 } |
412 } | 413 } |
413 } | 414 } |
414 } | 415 } |
415 | 416 |
416 } // namespace | 417 } // namespace |
OLD | NEW |