Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / cocoa / autofill / password_generation_popup_view_cocoa.mm

diff --git a/src/chrome/browser/ui/cocoa/autofill/password_generation_popup_view_cocoa.mm b/src/chrome/browser/ui/cocoa/autofill/password_generation_popup_view_cocoa.mm
index fb9ab45..a8a85fd 100644 (file)
--- a/src/chrome/browser/ui/cocoa/autofill/password_generation_popup_view_cocoa.mm
+++ b/src/chrome/browser/ui/cocoa/autofill/password_generation_popup_view_cocoa.mm
@@ -14,7 +14,6 @@
 #import "chrome/browser/ui/cocoa/hyperlink_text_view.h"
 #import "chrome/browser/ui/cocoa/l10n_util.h"
 #include "components/autofill/core/browser/popup_item_ids.h"
-#include "grit/ui_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/font_list.h"
@@ -106,10 +105,6 @@ NSColor* HelpLinkColor() {
   if (controller_->password_selected()) {
     // Draw a highlight under the suggested password.
     NSRect highlightBounds = [self passwordBounds];
-    highlightBounds.origin.y +=
-        PasswordGenerationPopupView::kPasswordVerticalInset;
-    highlightBounds.size.height -=
-        2 * PasswordGenerationPopupView::kPasswordVerticalInset;
     [[self highlightColor] set];
     [NSBezierPath fillRect:highlightBounds];
   }
@@ -188,19 +183,20 @@ NSColor* HelpLinkColor() {
 }
 
 - (NSRect)passwordBounds {
-  return NSRectFromCGRect(controller_->password_bounds().ToCGRect());
+  return NSZeroRect;
 }
 
 - (NSRect)helpBounds {
-  return NSRectFromCGRect(controller_->help_bounds().ToCGRect());
+  return NSZeroRect;
 }
 
 - (NSRect)dividerBounds {
-  return NSRectFromCGRect(controller_->divider_bounds().ToCGRect());
+  return NSZeroRect;
 }
 
 - (NSFont*)textFont {
-  return controller_->font_list().GetPrimaryFont().GetNativeFont();
+  return ResourceBundle::GetSharedInstance().GetFontList(
+      ResourceBundle::SmallFont).GetPrimaryFont().GetNativeFont();
 }
 
 @end