| 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 #import <AppKit/AppKit.h> | 7 #import <AppKit/AppKit.h> |
| 8 | 8 |
| 9 #include <cmath> | 9 #include <cmath> |
| 10 | 10 |
| (...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 370 [cookiesView_ setAutoresizingMask:NSViewWidthSizable]; | 370 [cookiesView_ setAutoresizingMask:NSViewWidthSizable]; |
| 371 [siteSettingsSectionView addSubview:cookiesView_]; | 371 [siteSettingsSectionView addSubview:cookiesView_]; |
| 372 | 372 |
| 373 permissionsView_ = | 373 permissionsView_ = |
| 374 [[[FlippedView alloc] initWithFrame:[superview frame]] autorelease]; | 374 [[[FlippedView alloc] initWithFrame:[superview frame]] autorelease]; |
| 375 [siteSettingsSectionView addSubview:permissionsView_]; | 375 [siteSettingsSectionView addSubview:permissionsView_]; |
| 376 | 376 |
| 377 // Create the link button to view site settings. Its position will be set in | 377 // Create the link button to view site settings. Its position will be set in |
| 378 // performLayout. | 378 // performLayout. |
| 379 NSString* siteSettingsButtonText = | 379 NSString* siteSettingsButtonText = |
| 380 l10n_util::GetNSString(IDS_PAGE_INFO_SITE_SETTINGS_LINK); | 380 l10n_util::GetNSString(IDS_PAGE_INFO_MORE_SETTINGS_LINK); |
| 381 siteSettingsButton_ = [self addButtonWithText:siteSettingsButtonText | 381 siteSettingsButton_ = [self addButtonWithText:siteSettingsButtonText |
| 382 toView:siteSettingsSectionView]; | 382 toView:siteSettingsSectionView]; |
| 383 [GTMUILocalizerAndLayoutTweaker sizeToFitView:siteSettingsButton_]; | 383 [GTMUILocalizerAndLayoutTweaker sizeToFitView:siteSettingsButton_]; |
| 384 | 384 |
| 385 [siteSettingsButton_ setTarget:self]; | 385 [siteSettingsButton_ setTarget:self]; |
| 386 [siteSettingsButton_ setAction:@selector(showSiteSettingsData:)]; | 386 [siteSettingsButton_ setAction:@selector(showSiteSettingsData:)]; |
| 387 | 387 |
| 388 return siteSettingsSectionView.get(); | 388 return siteSettingsSectionView.get(); |
| 389 } | 389 } |
| 390 | 390 |
| (...skipping 818 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1209 const CookieInfoList& cookie_info_list) { | 1209 const CookieInfoList& cookie_info_list) { |
| 1210 [bubble_controller_ setCookieInfo:cookie_info_list]; | 1210 [bubble_controller_ setCookieInfo:cookie_info_list]; |
| 1211 } | 1211 } |
| 1212 | 1212 |
| 1213 void WebsiteSettingsUIBridge::SetPermissionInfo( | 1213 void WebsiteSettingsUIBridge::SetPermissionInfo( |
| 1214 const PermissionInfoList& permission_info_list, | 1214 const PermissionInfoList& permission_info_list, |
| 1215 ChosenObjectInfoList chosen_object_info_list) { | 1215 ChosenObjectInfoList chosen_object_info_list) { |
| 1216 [bubble_controller_ setPermissionInfo:permission_info_list | 1216 [bubble_controller_ setPermissionInfo:permission_info_list |
| 1217 andChosenObjects:std::move(chosen_object_info_list)]; | 1217 andChosenObjects:std::move(chosen_object_info_list)]; |
| 1218 } | 1218 } |
| OLD | NEW |