AutoFill Mac dialog needs layout changes

Modifies entry labels with trailing colon for Mac UI.  Using correct validation icons now.  Nib changes for AutoFillAddressSheet.xib and AutoFillCreditCardSheet.xib: rearranges labels and entry fields to right align on label colons.  Changes label font to be regular size and regular weight.

BUG=46504
TEST=manual inspection of AutoFill UI.

Review URL: http://codereview.chromium.org/2842002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49734 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 21 insertions, 5 deletions

diff --git a/chrome/browser/autofill/autofill_dialog_controller_mac.mm b/chrome/browser/autofill/autofill_dialog_controller_mac.mm
index c39e3e8..7d37d85 100644
--- a/chrome/browser/autofill/autofill_dialog_controller_mac.mm
+++ b/chrome/browser/autofill/autofill_dialog_controller_mac.mm
@@ -18,7 +18,7 @@
 #include "chrome/browser/profile.h"
 #include "chrome/common/pref_names.h"
 #include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
+#include "grit/app_resources.h"
 
 // Delegate protocol that needs to be in place for the AutoFillTableView's
 // handling of delete and backspace keys.
@@ -725,12 +725,20 @@ void PersonalDataManagerObserver::OnPersonalDataLoaded() {
 }
 
 - (id)transformedValue:(id)string {
+  NSImage* image = nil;
+  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   if (string == nil || [string length] == 0) {
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    NSImage* image = rb.GetNSImageNamed(IDR_WARNING);
+    image = rb.GetNSImageNamed(IDR_INPUT_ALERT);
     DCHECK(image);
     return image;
   }
+
+  if (!image) {
+    image = rb.GetNSImageNamed(IDR_INPUT_GOOD);
+    DCHECK(image);
+    return image;
+  }
+
   return nil;
 }
 
@@ -754,6 +762,8 @@ void PersonalDataManagerObserver::OnPersonalDataLoaded() {
 }
 
 - (id)transformedValue:(id)string {
+  NSImage* image = nil;
+  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   if (string != nil && [string length] != 0) {
     // TODO(dhollowa): Using SetInfo() call to validate phone number.  Should
     // have explicit validation method.  More robust validation is needed as
@@ -762,12 +772,18 @@ void PersonalDataManagerObserver::OnPersonalDataLoaded() {
     profile.SetInfo(AutoFillType(PHONE_HOME_WHOLE_NUMBER),
                     base::SysNSStringToUTF16(string));
     if (profile.GetFieldText(AutoFillType(PHONE_HOME_WHOLE_NUMBER)).empty()) {
-      ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-      NSImage* image = rb.GetNSImageNamed(IDR_WARNING);
+      image = rb.GetNSImageNamed(IDR_INPUT_ALERT);
       DCHECK(image);
       return image;
     }
   }
+
+  if (!image) {
+    image = rb.GetNSImageNamed(IDR_INPUT_GOOD);
+    DCHECK(image);
+    return image;
+  }
+
   return nil;
 }