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

Side by Side Diff: chrome/browser/ui/cocoa/autofill/card_unmask_prompt_view_bridge.mm

Issue 2703253007: Use (i) icon and the same tooltip for the credit cards dialog and account chooser on Mac. (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
OLDNEW
1 // Copyright (c) 2015 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2015 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 #include "chrome/browser/ui/cocoa/autofill/card_unmask_prompt_view_bridge.h"
6
5 #include "base/bind.h" 7 #include "base/bind.h"
6 #include "base/strings/sys_string_conversions.h" 8 #include "base/strings/sys_string_conversions.h"
7 #include "base/threading/thread_task_runner_handle.h" 9 #include "base/threading/thread_task_runner_handle.h"
8 #include "chrome/browser/ui/autofill/autofill_dialog_models.h" 10 #include "chrome/browser/ui/autofill/autofill_dialog_models.h"
11 #import "chrome/browser/ui/cocoa/autofill/autofill_dialog_constants.h"
9 #import "chrome/browser/ui/cocoa/autofill/autofill_pop_up_button.h" 12 #import "chrome/browser/ui/cocoa/autofill/autofill_pop_up_button.h"
10 #import "chrome/browser/ui/cocoa/autofill/autofill_textfield.h" 13 #import "chrome/browser/ui/cocoa/autofill/autofill_textfield.h"
11 #import "chrome/browser/ui/cocoa/autofill/autofill_tooltip_controller.h" 14 #import "chrome/browser/ui/cocoa/autofill/autofill_tooltip_controller.h"
12 #include "chrome/browser/ui/cocoa/autofill/card_unmask_prompt_view_bridge.h"
13 #include "chrome/browser/ui/cocoa/chrome_style.h" 15 #include "chrome/browser/ui/cocoa/chrome_style.h"
14 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_button.h" 16 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_button.h"
15 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_control_u tils.h" 17 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_control_u tils.h"
16 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sh eet.h" 18 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sh eet.h"
17 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_wi ndow.h" 19 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_wi ndow.h"
18 #import "chrome/browser/ui/cocoa/key_equivalent_constants.h" 20 #import "chrome/browser/ui/cocoa/key_equivalent_constants.h"
19 #import "chrome/browser/ui/cocoa/l10n_util.h" 21 #import "chrome/browser/ui/cocoa/l10n_util.h"
20 #import "chrome/browser/ui/cocoa/spinner_view.h" 22 #import "chrome/browser/ui/cocoa/spinner_view.h"
21 #include "chrome/browser/ui/cocoa/themed_window.h" 23 #include "chrome/browser/ui/cocoa/themed_window.h"
22 #include "chrome/grit/generated_resources.h" 24 #include "chrome/grit/generated_resources.h"
23 #include "components/autofill/core/browser/ui/card_unmask_prompt_controller.h" 25 #include "components/autofill/core/browser/ui/card_unmask_prompt_controller.h"
24 #include "components/grit/components_scaled_resources.h" 26 #include "components/grit/components_scaled_resources.h"
25 #include "components/strings/grit/components_strings.h" 27 #include "components/strings/grit/components_strings.h"
26 #include "content/public/browser/web_contents.h" 28 #include "content/public/browser/web_contents.h"
27 #include "skia/ext/skia_utils_mac.h" 29 #include "skia/ext/skia_utils_mac.h"
28 #import "ui/base/cocoa/controls/hyperlink_button_cell.h" 30 #import "ui/base/cocoa/controls/hyperlink_button_cell.h"
29 #include "ui/base/cocoa/window_size_constants.h" 31 #include "ui/base/cocoa/window_size_constants.h"
30 #include "ui/base/l10n/l10n_util.h" 32 #include "ui/base/l10n/l10n_util.h"
31 #include "ui/gfx/color_palette.h" 33 #include "ui/gfx/color_palette.h"
34 #include "ui/gfx/image/image_skia_util_mac.h"
35 #include "ui/gfx/paint_vector_icon.h"
36 #include "ui/gfx/vector_icons_public.h"
32 #include "ui/native_theme/native_theme.h" 37 #include "ui/native_theme/native_theme.h"
33 38
34 namespace { 39 namespace {
35 40
36 const CGFloat kButtonGap = 6.0f; 41 const CGFloat kButtonGap = 6.0f;
37 const CGFloat kButtonsToRetriableErrorGap = 12.0f; 42 const CGFloat kButtonsToRetriableErrorGap = 12.0f;
38 const CGFloat kCvcInputWidth = 64.0f; 43 const CGFloat kCvcInputWidth = 64.0f;
39 const CGFloat kCvcInputToImageGap = 8.0f; 44 const CGFloat kCvcInputToImageGap = 8.0f;
40 const CGFloat kDialogContentMinWidth = 210.0f; 45 const CGFloat kDialogContentMinWidth = 210.0f;
41 const CGFloat kInputRowToInstructionsGap = 16.0f; 46 const CGFloat kInputRowToInstructionsGap = 16.0f;
(...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after
485 [storageCheckbox_ setButtonType:NSSwitchButton]; 490 [storageCheckbox_ setButtonType:NSSwitchButton];
486 [storageCheckbox_ 491 [storageCheckbox_
487 setTitle:base::SysUTF16ToNSString(l10n_util::GetStringUTF16( 492 setTitle:base::SysUTF16ToNSString(l10n_util::GetStringUTF16(
488 IDS_AUTOFILL_CARD_UNMASK_PROMPT_STORAGE_CHECKBOX))]; 493 IDS_AUTOFILL_CARD_UNMASK_PROMPT_STORAGE_CHECKBOX))];
489 [storageCheckbox_ 494 [storageCheckbox_
490 setState:(controller->GetStoreLocallyStartState() ? NSOnState 495 setState:(controller->GetStoreLocallyStartState() ? NSOnState
491 : NSOffState)]; 496 : NSOffState)];
492 [storageCheckbox_ sizeToFit]; 497 [storageCheckbox_ sizeToFit];
493 [box addSubview:storageCheckbox_]; 498 [box addSubview:storageCheckbox_];
494 499
495 // Add "?" icon with tooltip. 500 // Add "i" icon with tooltip.
496 storageTooltip_.reset([[AutofillTooltipController alloc] 501 storageTooltip_.reset([[AutofillTooltipController alloc]
497 initWithArrowLocation:info_bubble::kTopTrailing]); 502 initWithArrowLocation:info_bubble::kTopTrailing]);
498 [storageTooltip_ setImage:ui::ResourceBundle::GetSharedInstance() 503 [storageTooltip_ setMaxTooltipWidth:2 * autofill::kFieldWidth +
499 .GetNativeImageNamed(IDR_AUTOFILL_TOOLTIP_ICON) 504 autofill::kHorizontalFieldPadding];
500 .ToNSImage()]; 505 [storageTooltip_
506 setImage:gfx::NSImageFromImageSkia(gfx::CreateVectorIcon(
507 gfx::VectorIconId::INFO_OUTLINE, autofill::kInfoIconSize,
508 gfx::kChromeIconGrey))];
501 [storageTooltip_ 509 [storageTooltip_
502 setMessage:base::SysUTF16ToNSString(l10n_util::GetStringUTF16( 510 setMessage:base::SysUTF16ToNSString(l10n_util::GetStringUTF16(
503 IDS_AUTOFILL_CARD_UNMASK_PROMPT_STORAGE_TOOLTIP))]; 511 IDS_AUTOFILL_CARD_UNMASK_PROMPT_STORAGE_TOOLTIP))];
504 [box addSubview:[storageTooltip_ view]]; 512 [box addSubview:[storageTooltip_ view]];
505 [[storageTooltip_ view] setFrameOrigin: 513 [[storageTooltip_ view] setFrameOrigin:
506 NSMakePoint(NSMaxX([storageCheckbox_ frame]) + kButtonGap, 0)]; 514 NSMakePoint(NSMaxX([storageCheckbox_ frame]) + kButtonGap, 0)];
507 515
508 // Add horizontal separator. 516 // Add horizontal separator.
509 base::scoped_nsobject<NSBox> separator( 517 base::scoped_nsobject<NSBox> separator(
510 [CardUnmaskPromptViewCocoa createPlainBox]); 518 [CardUnmaskPromptViewCocoa createPlainBox]);
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
729 [verifyButton_ setAction:@selector(onVerify:)]; 737 [verifyButton_ setAction:@selector(onVerify:)];
730 [verifyButton_ sizeToFit]; 738 [verifyButton_ sizeToFit];
731 [self updateVerifyButtonEnabled]; 739 [self updateVerifyButtonEnabled];
732 [mainView addSubview:verifyButton_]; 740 [mainView addSubview:verifyButton_];
733 741
734 [self setView:mainView]; 742 [self setView:mainView];
735 [self performLayoutAndDisplay:NO]; 743 [self performLayoutAndDisplay:NO];
736 } 744 }
737 745
738 @end 746 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698