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

Side by Side Diff: chrome/browser/ui/cocoa/permission_bubble/permission_bubble_controller.mm

Issue 2753753006: cocoa: hide icon in permission bubble from a11y tree (Closed)
Patch Set: rebase Created 3 years, 9 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/permission_bubble/permission_bubble_controller. h" 5 #import "chrome/browser/ui/cocoa/permission_bubble/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 21 matching lines...) Expand all
32 #include "chrome/browser/ui/page_info/permission_menu_model.h" 32 #include "chrome/browser/ui/page_info/permission_menu_model.h"
33 #include "chrome/browser/ui/permission_bubble/permission_prompt.h" 33 #include "chrome/browser/ui/permission_bubble/permission_prompt.h"
34 #include "chrome/common/pref_names.h" 34 #include "chrome/common/pref_names.h"
35 #include "chrome/grit/generated_resources.h" 35 #include "chrome/grit/generated_resources.h"
36 #include "components/prefs/pref_service.h" 36 #include "components/prefs/pref_service.h"
37 #include "components/strings/grit/components_strings.h" 37 #include "components/strings/grit/components_strings.h"
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/a11y_util.h"
42 #include "ui/base/cocoa/cocoa_base_utils.h" 43 #include "ui/base/cocoa/cocoa_base_utils.h"
43 #import "ui/base/cocoa/controls/hyperlink_text_view.h" 44 #import "ui/base/cocoa/controls/hyperlink_text_view.h"
44 #import "ui/base/cocoa/menu_controller.h" 45 #import "ui/base/cocoa/menu_controller.h"
45 #include "ui/base/cocoa/window_size_constants.h" 46 #include "ui/base/cocoa/window_size_constants.h"
46 #include "ui/base/l10n/l10n_util_mac.h" 47 #include "ui/base/l10n/l10n_util_mac.h"
47 #include "ui/base/models/simple_menu_model.h" 48 #include "ui/base/models/simple_menu_model.h"
48 #include "ui/gfx/color_palette.h" 49 #include "ui/gfx/color_palette.h"
49 #include "ui/gfx/image/image_skia_util_mac.h" 50 #include "ui/gfx/image/image_skia_util_mac.h"
50 #include "ui/gfx/paint_vector_icon.h" 51 #include "ui/gfx/paint_vector_icon.h"
51 #include "url/gurl.h" 52 #include "url/gurl.h"
(...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after
490 - (NSView*)labelForRequest:(PermissionRequest*)request { 491 - (NSView*)labelForRequest:(PermissionRequest*)request {
491 DCHECK(request); 492 DCHECK(request);
492 base::scoped_nsobject<NSView> permissionView( 493 base::scoped_nsobject<NSView> permissionView(
493 [[NSView alloc] initWithFrame:NSZeroRect]); 494 [[NSView alloc] initWithFrame:NSZeroRect]);
494 base::scoped_nsobject<NSImageView> permissionIcon( 495 base::scoped_nsobject<NSImageView> permissionIcon(
495 [[NSImageView alloc] initWithFrame:NSZeroRect]); 496 [[NSImageView alloc] initWithFrame:NSZeroRect]);
496 [permissionIcon 497 [permissionIcon
497 setImage:NSImageFromImageSkia(gfx::CreateVectorIcon( 498 setImage:NSImageFromImageSkia(gfx::CreateVectorIcon(
498 request->GetIconId(), 18, gfx::kChromeIconGrey))]; 499 request->GetIconId(), 18, gfx::kChromeIconGrey))];
499 [permissionIcon setFrameSize:kPermissionIconSize]; 500 [permissionIcon setFrameSize:kPermissionIconSize];
501 ui::a11y_util::HideImageFromAccessibilityOrder(permissionIcon);
500 [permissionView addSubview:permissionIcon]; 502 [permissionView addSubview:permissionIcon];
501 503
502 base::scoped_nsobject<NSTextField> permissionLabel( 504 base::scoped_nsobject<NSTextField> permissionLabel(
503 [[NSTextField alloc] initWithFrame:NSZeroRect]); 505 [[NSTextField alloc] initWithFrame:NSZeroRect]);
504 base::string16 label = request->GetMessageTextFragment(); 506 base::string16 label = request->GetMessageTextFragment();
505 [permissionLabel setDrawsBackground:NO]; 507 [permissionLabel setDrawsBackground:NO];
506 [permissionLabel setBezeled:NO]; 508 [permissionLabel setBezeled:NO];
507 [permissionLabel setEditable:NO]; 509 [permissionLabel setEditable:NO];
508 [permissionLabel setSelectable:NO]; 510 [permissionLabel setSelectable:NO];
509 [permissionLabel 511 [permissionLabel
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
646 } 648 }
647 649
648 - (IBAction)cancel:(id)sender { 650 - (IBAction)cancel:(id)sender {
649 // This is triggered by ESC when the bubble has focus. 651 // This is triggered by ESC when the bubble has focus.
650 if (delegate_) 652 if (delegate_)
651 delegate_->Closing(); 653 delegate_->Closing();
652 [super cancel:sender]; 654 [super cancel:sender];
653 } 655 }
654 656
655 @end // implementation PermissionBubbleController 657 @end // implementation PermissionBubbleController
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698