Correct padding and focus ring for frameless constrained window dialog

chrome/browser/ui/cocoa/intents/web_intent_picker_view_controller.mm

 // Copyright (c) 2012 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/intents/web_intent_picker_view_controller.h"
 
 #include "base/sys_string_conversions.h"
 #import "chrome/browser/ui/cocoa/event_utils.h"
 #import "chrome/browser/ui/cocoa/flipped_view.h"
 #import "chrome/browser/ui/cocoa/hover_close_button.h"
 #import "chrome/browser/ui/cocoa/intents/web_intent_choose_service_view_controller.h"
 #import "chrome/browser/ui/cocoa/intents/web_intent_extension_prompt_view_controller.h"
 #import "chrome/browser/ui/cocoa/intents/web_intent_inline_service_view_controller.h"
 #import "chrome/browser/ui/cocoa/intents/web_intent_message_view_controller.h"
 #import "chrome/browser/ui/cocoa/intents/web_intent_picker_cocoa2.h"
 #import "chrome/browser/ui/cocoa/intents/web_intent_progress_view_controller.h"
 #import "chrome/browser/ui/cocoa/intents/web_intent_service_row_view_controller.h"
 #import "chrome/browser/ui/cocoa/key_equivalent_constants.h"
 #include "chrome/browser/ui/constrained_window.h"
+#include "chrome/browser/ui/constrained_window_constants.h"
 #include "chrome/browser/ui/intents/web_intent_picker_delegate.h"
 #include "chrome/browser/ui/intents/web_intent_inline_disposition_delegate.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "ui/base/cocoa/window_size_constants.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
 @interface WebIntentPickerViewController ()
 
 - (void)performLayout;
@@ skipping 145 matching lines @@
       [self currentViewController];
   NSSize minSize =
       [viewController minimumSizeForInnerWidth:NSWidth(innerFrame)];
   innerFrame.size.width = std::max(minSize.width, NSWidth(innerFrame));
   innerFrame.size.width = std::min(
       static_cast<CGFloat>(WebIntentPicker::kWindowMaxWidth),
       NSWidth(innerFrame));
   innerFrame.size.height = std::max(minSize.height, NSHeight(innerFrame));
 
   NSRect bounds = NSInsetRect(innerFrame,
-                              -ConstrainedWindow::kHorizontalPadding,
-                              -ConstrainedWindow::kVerticalPadding);
+                              -ConstrainedWindowConstants::kHorizontalPadding,
+                              0);
+  bounds.origin.y -= ConstrainedWindowConstants::kClientTopPadding;
+  bounds.size.height = NSHeight(innerFrame) +
+      ConstrainedWindowConstants::kClientTopPadding +
+      ConstrainedWindowConstants::kClientBottomPadding;
 
   [[viewController view] setFrame:bounds];
   [viewController layoutSubviewsWithinFrame:innerFrame];
 
   NSRect closeFrame;
   closeFrame.size.width = ConstrainedWindow::GetCloseButtonSize();
   closeFrame.size.height = ConstrainedWindow::GetCloseButtonSize();
   closeFrame.origin.x = NSMaxX(innerFrame) - NSWidth(closeFrame);
   closeFrame.origin.y = NSMinY(innerFrame);
   [closeButton_ setFrame:closeFrame];
 
   [[self view] setFrame:bounds];
 }
 
 - (NSRect)minimumInnerFrame {
   NSRect bounds = NSMakeRect(0, 0, WebIntentPicker::kWindowMinWidth,
                              WebIntentPicker::kWindowMinHeight);
-  return NSInsetRect(bounds,
-                     ConstrainedWindow::kHorizontalPadding,
-                     ConstrainedWindow::kVerticalPadding);
+  bounds = NSInsetRect(bounds,
+                       ConstrainedWindowConstants::kHorizontalPadding,
+                       0);
+  bounds.origin.y += ConstrainedWindowConstants::kClientTopPadding;
+  bounds.size.height = bounds.size.height -
+      ConstrainedWindowConstants::kClientTopPadding -
+      ConstrainedWindowConstants::kClientBottomPadding;
+  return bounds;
 }
 
 - (NSViewController<WebIntentViewController>*)currentViewController {
   switch (state_) {
     case PICKER_STATE_WAITING:
       return progressViewController_;
     case PICKER_STATE_NO_SERVICE:
       return messageViewController_;
     case PICKER_STATE_CHOOSE_SERVICE:
       return chooseServiceViewController_;
@@ skipping 179 matching lines @@
   WindowOpenDisposition disposition =
       event_utils::WindowOpenDispositionFromNSEvent([NSApp currentEvent]);
   picker_->delegate()->OnSuggestionsLinkClicked(disposition);
 }
 
 - (void)onChooseAnotherService:(id)sender {
   picker_->delegate()->OnChooseAnotherService();
 }
 
 @end