osx fix for M41 beta

jefry-vcube · jefry-vcube · commit 26e9b7179ca7 · 2015-01-30T15:19:26.000+08:00
diff --git a/src/browser/app_controller_mac.mm b/src/browser/app_controller_mac.mm
@@ -34,8 +34,8 @@ @implementation AppController
 - (BOOL)application:(NSApplication*)sender
            openFile:(NSString*)filename {
   if (content::Shell::windows().size() == 0) {
-    CommandLine::ForCurrentProcess()->AppendArg([filename UTF8String]);
-    CommandLine::ForCurrentProcess()->FixOrigArgv4Finder([filename UTF8String]);
+    base::CommandLine::ForCurrentProcess()->AppendArg([filename UTF8String]);
+    base::CommandLine::ForCurrentProcess()->FixOrigArgv4Finder([filename UTF8String]);
     return TRUE;
   }
 
diff --git a/src/browser/autofill_popup_view_bridge.mm b/src/browser/autofill_popup_view_bridge.mm
@@ -10,7 +10,6 @@
 #include "chrome/browser/ui/autofill/autofill_popup_controller.h"
 #include "chrome/browser/ui/autofill/autofill_popup_view_delegate.h"
 #import "chrome/browser/ui/cocoa/autofill/autofill_popup_view_cocoa.h"
-#include "ui/gfx/rect.h"
 
 namespace autofill {
 
diff --git a/src/browser/autofill_popup_view_cocoa.mm b/src/browser/autofill_popup_view_cocoa.mm
@@ -10,12 +10,11 @@
 #include "chrome/browser/ui/autofill/popup_constants.h"
 #include "chrome/browser/ui/cocoa/autofill/autofill_popup_view_bridge.h"
 #include "components/autofill/core/browser/popup_item_ids.h"
+#include "components/autofill/core/browser/suggestion.h"
 #include "ui/base/cocoa/window_size_constants.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/image/image.h"
-#include "ui/gfx/point.h"
-#include "ui/gfx/rect.h"
 
 using autofill::AutofillPopupView;
 
@@ -97,31 +96,31 @@ - (void)drawRect:(NSRect)dirtyRect {
 
   [self drawBackgroundAndBorder];
 
-  for (size_t i = 0; i < controller_->names().size(); ++i) {
+  for (size_t i = 0; i < controller_->GetLineCount(); ++i) {
     // Skip rows outside of the dirty rect.
     NSRect rowBounds =
         NSRectFromCGRect(controller_->GetRowBounds(i).ToCGRect());
     if (!NSIntersectsRect(rowBounds, dirtyRect))
       continue;
 
-    if (controller_->identifiers()[i] == autofill::POPUP_ITEM_ID_SEPARATOR) {
+    if (controller_->GetSuggestionAt(i).frontend_id == autofill::POPUP_ITEM_ID_SEPARATOR) {
       [self drawSeparatorWithBounds:rowBounds];
       continue;
     }
 
     // Additional offset applied to the text in the vertical direction.
     CGFloat textYOffset = 0;
     BOOL imageFirst = NO;
-    if (controller_->identifiers()[i] ==
+    if (controller_->GetSuggestionAt(i).frontend_id ==
         autofill::POPUP_ITEM_ID_MAC_ACCESS_CONTACTS) {
       // Due to the weighting of the asset used for this autofill entry, the
       // text needs to be bumped up by 1 pt to make it look vertically aligned.
       textYOffset = -1;
       imageFirst = YES;
     }
 
-    NSString* name = SysUTF16ToNSString(controller_->names()[i]);
-    NSString* subtext = SysUTF16ToNSString(controller_->subtexts()[i]);
+    NSString* name = SysUTF16ToNSString(controller_->GetElidedValueAt(i));
+    NSString* subtext = SysUTF16ToNSString(controller_->GetElidedLabelAt(i));
     BOOL isSelected = static_cast<int>(i) == controller_->selected_line();
     [self drawSuggestionWithName:name
                          subtext:subtext
@@ -203,7 +202,7 @@ - (CGFloat)drawName:(NSString*)name
       controller_->IsWarning(index) ? [self warningColor] : [self nameColor];
   NSDictionary* nameAttributes =
       [NSDictionary dictionaryWithObjectsAndKeys:
-           controller_->GetNameFontListForRow(index).GetPrimaryFont().
+           controller_->GetValueFontListForRow(index).GetPrimaryFont().
                GetNativeFont(),
            NSFontAttributeName, nameColor, NSForegroundColorAttributeName,
            nil];
@@ -247,7 +246,7 @@ - (CGFloat)drawSubtext:(NSString*)subtext
            textYOffset:(CGFloat)textYOffset {
   NSDictionary* subtextAttributes =
       [NSDictionary dictionaryWithObjectsAndKeys:
-           controller_->subtext_font_list().GetPrimaryFont().GetNativeFont(),
+           controller_->GetLabelFontList().GetPrimaryFont().GetNativeFont(),
            NSFontAttributeName,
            [self subtextColor],
            NSForegroundColorAttributeName,
@@ -263,10 +262,10 @@ - (CGFloat)drawSubtext:(NSString*)subtext
 }
 
 - (NSImage*)iconAtIndex:(size_t)index {
-  if (controller_->icons()[index].empty())
+  if (controller_->GetSuggestionAt(index).icon.empty())
     return nil;
 
-  int iconId = controller_->GetIconResourceID(controller_->icons()[index]);
+  int iconId = controller_->GetIconResourceID(controller_->GetSuggestionAt(index).icon);
   DCHECK_NE(-1, iconId);
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
diff --git a/src/browser/native_window.h b/src/browser/native_window.h
@@ -66,11 +66,13 @@ class CapturePageHelper;
 
 #if defined(OS_WIN) || defined(OS_LINUX)
 class NativeWindow : public web_modal::WebContentsModalDialogHost {
+public:
+  ~NativeWindow() override;
 #else
 class NativeWindow {
+public:
+  virtual ~NativeWindow();
 #endif
- public:
-  ~NativeWindow() override;
 
   static NativeWindow* Create(const base::WeakPtr<content::Shell>& shell,
                               base::DictionaryValue* manifest);
diff --git a/src/browser/native_window_mac.mm b/src/browser/native_window_mac.mm
@@ -495,8 +495,6 @@ - (void)drawRect:(NSRect)dirtyRect {
 void NativeWindowCocoa::Show() {
   NSApplication *myApp = [NSApplication sharedApplication];
   [myApp activateIgnoringOtherApps:NO];
-  content::RenderWidgetHostView* rwhv =
-      shell_->web_contents()->GetRenderWidgetHostView();
 
   if (first_show_ && initial_focus_) {
     [window() makeKeyAndOrderFront:nil];
