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

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

Issue 2341213004: permissions prompt: use unicode hostname, not IDN (Closed)
Patch Set: display_url -> displayUrl Created 4 years, 3 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 | chrome/browser/ui/views/website_settings/permission_prompt_impl.cc » ('j') | 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/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 18 matching lines...) Expand all
29 #include "chrome/browser/ui/exclusive_access/exclusive_access_context.h" 29 #include "chrome/browser/ui/exclusive_access/exclusive_access_context.h"
30 #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h" 30 #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h"
31 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" 31 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
32 #include "chrome/browser/ui/website_settings/permission_menu_model.h" 32 #include "chrome/browser/ui/website_settings/permission_menu_model.h"
33 #include "chrome/browser/ui/website_settings/permission_prompt.h" 33 #include "chrome/browser/ui/website_settings/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 "components/url_formatter/url_formatter.h"
39 #include "content/public/browser/native_web_keyboard_event.h" 40 #include "content/public/browser/native_web_keyboard_event.h"
40 #include "content/public/browser/user_metrics.h" 41 #include "content/public/browser/user_metrics.h"
41 #include "skia/ext/skia_utils_mac.h" 42 #include "skia/ext/skia_utils_mac.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 "url/gurl.h" 49 #include "url/gurl.h"
(...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after
546 return permissionView.autorelease(); 547 return permissionView.autorelease();
547 } 548 }
548 549
549 - (NSView*)titleWithOrigin:(const GURL&)origin { 550 - (NSView*)titleWithOrigin:(const GURL&)origin {
550 base::scoped_nsobject<NSTextField> titleView( 551 base::scoped_nsobject<NSTextField> titleView(
551 [[NSTextField alloc] initWithFrame:NSZeroRect]); 552 [[NSTextField alloc] initWithFrame:NSZeroRect]);
552 [titleView setDrawsBackground:NO]; 553 [titleView setDrawsBackground:NO];
553 [titleView setBezeled:NO]; 554 [titleView setBezeled:NO];
554 [titleView setEditable:NO]; 555 [titleView setEditable:NO];
555 [titleView setSelectable:NO]; 556 [titleView setSelectable:NO];
557 base::string16 displayUrl = url_formatter::FormatUrlForSecurityDisplay(
558 origin, url_formatter::SchemeDisplay::OMIT_CRYPTOGRAPHIC);
559 if (base::IsStringASCII(displayUrl))
jungshik at Google 2016/09/27 17:58:00 Here does the url have any query or path part or i
560 displayUrl = url_formatter::IDNToUnicode(base::UTF16ToASCII(displayUrl));
556 [titleView setStringValue:l10n_util::GetNSStringF( 561 [titleView setStringValue:l10n_util::GetNSStringF(
557 IDS_PERMISSIONS_BUBBLE_PROMPT, 562 IDS_PERMISSIONS_BUBBLE_PROMPT, displayUrl)];
558 url_formatter::FormatUrlForSecurityDisplay(
559 origin, url_formatter::SchemeDisplay::
560 OMIT_CRYPTOGRAPHIC))];
561 [titleView setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]]; 563 [titleView setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]];
562 [titleView sizeToFit]; 564 [titleView sizeToFit];
563 NSRect titleFrame = [titleView frame]; 565 NSRect titleFrame = [titleView frame];
564 [titleView setFrameSize:NSMakeSize(NSWidth(titleFrame) + kTitlePaddingX, 566 [titleView setFrameSize:NSMakeSize(NSWidth(titleFrame) + kTitlePaddingX,
565 NSHeight(titleFrame))]; 567 NSHeight(titleFrame))];
566 return titleView.autorelease(); 568 return titleView.autorelease();
567 } 569 }
568 570
569 - (NSView*)menuForRequest:(PermissionRequest*)request 571 - (NSView*)menuForRequest:(PermissionRequest*)request
570 atIndex:(int)index 572 atIndex:(int)index
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
650 652
651 + (void)alignCenterOf:(NSView*)viewA verticallyToCenterOf:(NSView*)viewB { 653 + (void)alignCenterOf:(NSView*)viewA verticallyToCenterOf:(NSView*)viewB {
652 NSRect frameA = [viewA frame]; 654 NSRect frameA = [viewA frame];
653 NSRect frameB = [viewB frame]; 655 NSRect frameB = [viewB frame];
654 frameA.origin.y = 656 frameA.origin.y =
655 NSMinY(frameB) + std::floor((NSHeight(frameB) - NSHeight(frameA)) / 2); 657 NSMinY(frameB) + std::floor((NSHeight(frameB) - NSHeight(frameA)) / 2);
656 [viewA setFrameOrigin:frameA.origin]; 658 [viewA setFrameOrigin:frameA.origin];
657 } 659 }
658 660
659 @end // implementation PermissionBubbleController 661 @end // implementation PermissionBubbleController
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/website_settings/permission_prompt_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698