Correct padding and focus ring for frameless constrained window dialog

chrome/browser/ui/cocoa/web_intent_sheet_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/web_intent_sheet_controller.h"
 
 #include "base/memory/scoped_nsobject.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser_list.h"
 #import "chrome/browser/ui/cocoa/event_utils.h"
 #import "chrome/browser/ui/cocoa/hover_close_button.h"
 #import "chrome/browser/ui/cocoa/hyperlink_button_cell.h"
 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
 #import "chrome/browser/ui/cocoa/info_bubble_window.h"
 #include "chrome/browser/ui/cocoa/web_intent_picker_cocoa.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_picker_model.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #import "chrome/browser/ui/cocoa/tabs/throbber_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "grit/generated_resources.h"
 #include "grit/google_chrome_strings.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
@@ skipping 233 matching lines @@
 @implementation HeaderView
 - (id)init {
   NSRect contentFrame = NSMakeRect(0, 0, WebIntentPicker::kWindowMinWidth, 1);
   if (self = [super initWithFrame:contentFrame]) {
     NSRect frame = NSMakeRect(WebIntentPicker::kContentAreaBorder, 0,
                               kTextWidth, 1);
 
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     titleField_.reset([[NSTextField alloc] initWithFrame:frame]);
     ConfigureTextFieldAsLabel(titleField_);
-    gfx::Font titleFont = rb.GetFont(ConstrainedWindow::kTitleFontStyle);
+    gfx::Font titleFont = rb.GetFont(
+        ConstrainedWindowConstants::kTitleFontStyle);
     titleFont = titleFont.DeriveFont(0, gfx::Font::BOLD);
     [titleField_ setFont:titleFont.GetNativeFont()];
 
     frame = NSMakeRect(WebIntentPicker::kContentAreaBorder, 0,
                        kTextWidth, 1);
     subtitleField_.reset([[NSTextField alloc] initWithFrame:frame]);
     ConfigureTextFieldAsLabel(subtitleField_);
-    gfx::Font textFont = rb.GetFont(ConstrainedWindow::kTextFontStyle);
+    gfx::Font textFont = rb.GetFont(ConstrainedWindowConstants::kTextFontStyle);
     [subtitleField_ setFont:textFont.GetNativeFont()];
 
     frame = NSMakeRect(0, 0, WebIntentPicker::kWindowMinWidth, 1.0);
     spacer_.reset([[NSBox alloc] initWithFrame:frame]);
     [spacer_ setBoxType:NSBoxSeparator];
     [spacer_ setBorderColor:[NSColor blackColor]];
     [spacer_ setAlphaValue:0.2];
 
     NSArray* subviews = @[titleField_, subtitleField_, spacer_];
     [self setSubviews:subviews];
@@ skipping 755 matching lines @@
 }
 
 - (NSView*)createEmptyView {
   NSRect titleFrame = NSMakeRect(WebIntentPicker::kContentAreaBorder,
                                  WebIntentPicker::kContentAreaBorder,
                                  kTextWidth, 1);
   scoped_nsobject<NSTextField> title(
       [[NSTextField alloc] initWithFrame:titleFrame]);
   ConfigureTextFieldAsLabel(title);
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  gfx::Font titleFont = rb.GetFont(ConstrainedWindow::kTitleFontStyle);
+  gfx::Font titleFont = rb.GetFont(ConstrainedWindowConstants::kTitleFontStyle);
   titleFont = titleFont.DeriveFont(0, gfx::Font::BOLD);
   [title setFont:titleFont.GetNativeFont()];
   [title setStringValue:
       l10n_util::GetNSStringWithFixup(IDS_INTENT_PICKER_NO_SERVICES_TITLE)];
   titleFrame.size.height +=
       [GTMUILocalizerAndLayoutTweaker sizeToFitFixedWidthTextField:title];
 
   NSRect bodyFrame = titleFrame;
   bodyFrame.origin.y +=
       NSHeight(titleFrame) + WebIntentPicker::kContentAreaBorder;
@@ skipping 80 matching lines @@
 
 - (void)setActionString:(NSString*)actionString {
   NSRect textFrame;
   if (!actionTextField_.get()) {
     textFrame = NSMakeRect(WebIntentPicker::kContentAreaBorder, 0,
                            kTextWidth, 1);
 
     actionTextField_.reset([[NSTextField alloc] initWithFrame:textFrame]);
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     ConfigureTextFieldAsLabel(actionTextField_);
-    gfx::Font titleFont = rb.GetFont(ConstrainedWindow::kTitleFontStyle);
+    gfx::Font titleFont = rb.GetFont(
+        ConstrainedWindowConstants::kTitleFontStyle);
     titleFont = titleFont.DeriveFont(0, gfx::Font::BOLD);
     [actionTextField_ setFont:titleFont.GetNativeFont()];
   } else {
     textFrame = [actionTextField_ frame];
   }
 
   [actionTextField_ setStringValue:actionString];
   textFrame.size.height +=
       [GTMUILocalizerAndLayoutTweaker sizeToFitFixedWidthTextField:
             actionTextField_];
@@ skipping 13 matching lines @@
 - (void)stopThrobber {
   [closeButton_ setEnabled:YES];
   [intentView_ stopThrobber];
 }
 
 - (void)closeSheet {
   [NSApp endSheet:[self window]];
 }
 
 @end  // WebIntentPickerSheetController