| 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/permission_bubble_controller.h
" | 5 #import "chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.h
" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/mac/bind_objc_block.h" | 9 #include "base/mac/bind_objc_block.h" |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 #include "components/url_formatter/elide_url.h" | 38 #include "components/url_formatter/elide_url.h" |
| 39 #include "content/public/browser/native_web_keyboard_event.h" | 39 #include "content/public/browser/native_web_keyboard_event.h" |
| 40 #include "content/public/browser/user_metrics.h" | 40 #include "content/public/browser/user_metrics.h" |
| 41 #include "skia/ext/skia_utils_mac.h" | 41 #include "skia/ext/skia_utils_mac.h" |
| 42 #include "ui/base/cocoa/cocoa_base_utils.h" | 42 #include "ui/base/cocoa/cocoa_base_utils.h" |
| 43 #import "ui/base/cocoa/controls/hyperlink_text_view.h" | 43 #import "ui/base/cocoa/controls/hyperlink_text_view.h" |
| 44 #import "ui/base/cocoa/menu_controller.h" | 44 #import "ui/base/cocoa/menu_controller.h" |
| 45 #include "ui/base/cocoa/window_size_constants.h" | 45 #include "ui/base/cocoa/window_size_constants.h" |
| 46 #include "ui/base/l10n/l10n_util_mac.h" | 46 #include "ui/base/l10n/l10n_util_mac.h" |
| 47 #include "ui/base/models/simple_menu_model.h" | 47 #include "ui/base/models/simple_menu_model.h" |
| 48 #include "ui/gfx/color_palette.h" |
| 49 #include "ui/gfx/image/image_skia_util_mac.h" |
| 50 #include "ui/gfx/paint_vector_icon.h" |
| 48 #include "url/gurl.h" | 51 #include "url/gurl.h" |
| 49 | 52 |
| 50 using base::UserMetricsAction; | 53 using base::UserMetricsAction; |
| 51 | 54 |
| 52 namespace { | 55 namespace { |
| 53 | 56 |
| 54 // Distance between permission icon and permission label. | 57 // Distance between permission icon and permission label. |
| 55 const CGFloat kHorizontalIconPadding = 8.0f; | 58 const CGFloat kHorizontalIconPadding = 8.0f; |
| 56 | 59 |
| 57 // Distance between two permission labels. | 60 // Distance between two permission labels. |
| (...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 499 DCHECK(browser_->window()); | 502 DCHECK(browser_->window()); |
| 500 return browser_->window()->GetNativeWindow(); | 503 return browser_->window()->GetNativeWindow(); |
| 501 } | 504 } |
| 502 | 505 |
| 503 - (NSView*)labelForRequest:(PermissionRequest*)request { | 506 - (NSView*)labelForRequest:(PermissionRequest*)request { |
| 504 DCHECK(request); | 507 DCHECK(request); |
| 505 base::scoped_nsobject<NSView> permissionView( | 508 base::scoped_nsobject<NSView> permissionView( |
| 506 [[NSView alloc] initWithFrame:NSZeroRect]); | 509 [[NSView alloc] initWithFrame:NSZeroRect]); |
| 507 base::scoped_nsobject<NSImageView> permissionIcon( | 510 base::scoped_nsobject<NSImageView> permissionIcon( |
| 508 [[NSImageView alloc] initWithFrame:NSZeroRect]); | 511 [[NSImageView alloc] initWithFrame:NSZeroRect]); |
| 509 [permissionIcon setImage:ui::ResourceBundle::GetSharedInstance(). | 512 [permissionIcon setImage:NSImageFromImageSkia( |
| 510 GetNativeImageNamed(request->GetIconId()).ToNSImage()]; | 513 gfx::CreateVectorIcon(request->GetVectorIconId(), 18, |
| 514 gfx::kChromeIconGrey))]; |
| 511 [permissionIcon setFrameSize:kPermissionIconSize]; | 515 [permissionIcon setFrameSize:kPermissionIconSize]; |
| 512 [permissionView addSubview:permissionIcon]; | 516 [permissionView addSubview:permissionIcon]; |
| 513 | 517 |
| 514 base::scoped_nsobject<NSTextField> permissionLabel( | 518 base::scoped_nsobject<NSTextField> permissionLabel( |
| 515 [[NSTextField alloc] initWithFrame:NSZeroRect]); | 519 [[NSTextField alloc] initWithFrame:NSZeroRect]); |
| 516 base::string16 label = request->GetMessageTextFragment(); | 520 base::string16 label = request->GetMessageTextFragment(); |
| 517 [permissionLabel setDrawsBackground:NO]; | 521 [permissionLabel setDrawsBackground:NO]; |
| 518 [permissionLabel setBezeled:NO]; | 522 [permissionLabel setBezeled:NO]; |
| 519 [permissionLabel setEditable:NO]; | 523 [permissionLabel setEditable:NO]; |
| 520 [permissionLabel setSelectable:NO]; | 524 [permissionLabel setSelectable:NO]; |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 650 | 654 |
| 651 + (void)alignCenterOf:(NSView*)viewA verticallyToCenterOf:(NSView*)viewB { | 655 + (void)alignCenterOf:(NSView*)viewA verticallyToCenterOf:(NSView*)viewB { |
| 652 NSRect frameA = [viewA frame]; | 656 NSRect frameA = [viewA frame]; |
| 653 NSRect frameB = [viewB frame]; | 657 NSRect frameB = [viewB frame]; |
| 654 frameA.origin.y = | 658 frameA.origin.y = |
| 655 NSMinY(frameB) + std::floor((NSHeight(frameB) - NSHeight(frameA)) / 2); | 659 NSMinY(frameB) + std::floor((NSHeight(frameB) - NSHeight(frameA)) / 2); |
| 656 [viewA setFrameOrigin:frameA.origin]; | 660 [viewA setFrameOrigin:frameA.origin]; |
| 657 } | 661 } |
| 658 | 662 |
| 659 @end // implementation PermissionBubbleController | 663 @end // implementation PermissionBubbleController |
| OLD | NEW |