Change 'const' -> 'constexpr' in cocoa/passwords.

chrome/browser/ui/cocoa/passwords/account_chooser_view_controller.mm

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/passwords/account_chooser_view_controller.h"
 
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #import "chrome/browser/ui/cocoa/passwords/account_avatar_fetcher_manager.h"
 #import "chrome/browser/ui/cocoa/passwords/credential_item_button.h"
 #import "chrome/browser/ui/cocoa/passwords/passwords_bubble_utils.h"
 #include "chrome/browser/ui/passwords/manage_passwords_view_utils.h"
 #include "chrome/browser/ui/passwords/password_dialog_controller.h"
 #include "chrome/browser/ui/passwords/password_dialog_prompts.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/autofill/core/common/password_form.h"
 #include "components/password_manager/core/common/credential_manager_types.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "ui/base/cocoa/controls/hyperlink_text_view.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/strings/grit/ui_strings.h"
 
 namespace {
 
+// Returns height of one credential item.
+constexpr CGFloat kCredentialHeight =
+    kAvatarImageSize + 2 * kVerticalAvatarMargin;
+
 // Maximum number of accounts displayed before vertical scrolling appears.
-const size_t kMaxAccounts = 3;
-
-// Returns height of one credential item.
-CGFloat CredentialHeight() {
-  return kAvatarImageSize + 2 * kVerticalAvatarMargin;
-}
+constexpr size_t kMaxAccounts = 3;
 
 }  // namespace
 
 @interface AccountChooserViewController () {
   NSButton* cancelButton_;  // Weak.
   NSTextView* titleView_;   //  Weak.
   base::scoped_nsobject<NSArray> credentialButtons_;
   base::scoped_nsobject<AccountAvatarFetcherManager> avatarManager_;
 }
 - (void)onCancelClicked:(id)sender;
@@ skipping 50 matching lines @@
   [cancelButton_ setAction:@selector(onCancelClicked:)];
   [view addSubview:cancelButton_];
 
   // Lay out the views.
   [cancelButton_ setFrameOrigin:NSMakePoint(
       kFramePadding + width - NSWidth([cancelButton_ frame]),
       kFramePadding)];
 
   NSSize buttonsSize = NSMakeSize(
       kDesiredBubbleWidth,
-      std::min([credentialButtons_ count], kMaxAccounts) * CredentialHeight());
+      std::min([credentialButtons_ count], kMaxAccounts) * kCredentialHeight);
   base::scoped_nsobject<NSScrollView> scrollView = [[NSScrollView alloc]
       initWithFrame:NSMakeRect(0, 0, buttonsSize.width, buttonsSize.height)];
   [scrollView setHasVerticalScroller:[credentialButtons_ count] > kMaxAccounts
                                          ? YES
                                          : NO];
   [scrollView setBorderType:NSNoBorder];
   CGFloat buttonWidth = [scrollView contentSize].width;
   CGFloat curY = 0;
   base::scoped_nsobject<NSView> documentView([[NSView alloc]
       initWithFrame:NSMakeRect(0, 0, buttonWidth, [credentialButtons_ count] *
-                                                      CredentialHeight())]);
+                                                      kCredentialHeight)]);
   for (CredentialItemButton* button in credentialButtons_.get()) {
     [documentView addSubview:button];
-    [button setFrame:NSMakeRect(0, curY, buttonWidth, CredentialHeight())];
+    [button setFrame:NSMakeRect(0, curY, buttonWidth, kCredentialHeight)];
     curY = NSMaxY([button frame]);
   }
   [scrollView setDocumentView:documentView];
   [view addSubview:scrollView];
   [documentView scrollRectToVisible:NSMakeRect(0, curY, buttonWidth, 0)];
   curY = NSMaxY([cancelButton_ frame]) + 3 * kRelatedControlVerticalSpacing;
   [scrollView setFrameOrigin:NSMakePoint(0, curY)];
   curY = NSMaxY([scrollView frame]) + 2 * kRelatedControlVerticalSpacing;
 
   [titleView_ setFrameOrigin:NSMakePoint(kFramePadding, curY)];
@@ skipping 21 matching lines @@
       base::mac::ObjCCastStrict<CredentialItemButton>(sender);
   if (bridge_ && bridge_->GetDialogController()) {
     bridge_->GetDialogController()->OnChooseCredentials(*button.passwordForm,
                                                         button.credentialType);
   }
 }
 
 - (void)loadCredentialItems {
   base::scoped_nsobject<NSMutableArray> items([[NSMutableArray alloc] init]);
   PasswordDialogController* controller = self.bridge->GetDialogController();
-  NSRect rect = NSMakeRect(0, 0, kDesiredBubbleWidth, CredentialHeight());
+  NSRect rect = NSMakeRect(0, 0, kDesiredBubbleWidth, kCredentialHeight);
   for (const auto& form : controller->GetLocalForms()) {
     base::scoped_nsobject<CredentialItemButton> item(
         [[CredentialItemButton alloc]
               initWithFrame:rect
             backgroundColor:[NSColor textBackgroundColor]
                  hoverColor:skia::SkColorToSRGBNSColor(kButtonHoverColor)]);
     [item setPasswordForm:form.get()];
     [item setCredentialType:password_manager::CredentialType::
                                 CREDENTIAL_TYPE_PASSWORD];
     std::pair<base::string16, base::string16> labels =
@@ skipping 51 matching lines @@
 
 - (NSArray*)credentialButtons {
   return credentialButtons_;
 }
 
 - (NSTextView*)titleView {
   return titleView_;
 }
 
 @end