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