[Mac] Simplify getting page-action info-bubble point.

chrome/browser/cocoa/location_bar/location_bar_view_mac.mm

 // Copyright (c) 2010 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/cocoa/location_bar/location_bar_view_mac.h"
 
 #include "app/l10n_util_mac.h"
 #include "app/resource_bundle.h"
 #include "base/i18n/rtl.h"
 #include "base/nsimage_cache_mac.h"
@@ skipping 266 matching lines @@
 
 void LocationBarViewMac::SetPreviewEnabledPageAction(
     ExtensionAction* page_action, bool preview_enabled) {
   DCHECK(page_action);
   TabContents* contents = GetTabContents();
   if (!contents)
     return;
   page_action_views_.RefreshViews();
   [field_ setNeedsDisplay:YES];
 
-  LocationBarViewMac::PageActionImageView* page_action_image_view =
-      GetPageActionImageView(page_action);
+  LocationBarViewMac::PageActionImageView* page_action_image_view = NULL;
+  for (size_t i = 0; i < page_action_views_.Count(); ++i) {
+    if (page_action_views_.ViewAt(i)->page_action() == page_action)
+      page_action_image_view = page_action_views_.ViewAt(i);
+  }
   DCHECK(page_action_image_view);
   if (!page_action_image_view)
     return;
 
   page_action_image_view->set_preview_enabled(preview_enabled);
   page_action_image_view->UpdateVisibility(contents,
       GURL(WideToUTF8(toolbar_model_->GetText())));
 }
 
-NSRect LocationBarViewMac::GetPageActionFrame(ExtensionAction* page_action) {
-  const size_t index = GetPageActionIndex(page_action);
+NSPoint LocationBarViewMac::GetPageActionBubblePoint(
+    ExtensionAction* page_action) {
+  DCHECK(page_action);
+  size_t index = 0;
+  for (; index < page_action_views_.Count(); ++index) {
+    if (page_action_views_.ViewAt(index)->page_action() == page_action)
+      break;
+  }
+  DCHECK_LT(index, page_action_views_.Count());
+  if (index == page_action_views_.Count())
+    return NSZeroPoint;
+
   AutocompleteTextFieldCell* cell = [field_ autocompleteTextFieldCell];
-  const NSRect iconRect =
-      [cell pageActionFrameForIndex:index inFrame:[field_ bounds]];
-  return [field_ convertRect:iconRect toView:nil];
-}
+  NSRect frame = [cell pageActionFrameForIndex:index inFrame:[field_ bounds]];
+  if (!NSIsEmptyRect(frame)) {
+    frame = [field_ convertRect:frame toView:nil];
+    return NSMakePoint(NSMidX(frame), NSMinY(frame));
+  }
 
-size_t LocationBarViewMac::GetPageActionIndex(ExtensionAction* page_action) {
-  DCHECK(page_action);
-  for (size_t i = 0; i < page_action_views_.Count(); ++i) {
-    if (page_action_views_.ViewAt(i)->page_action() == page_action)
-      return i;
-  }
   NOTREACHED();
-  return 0;
-}
-
-LocationBarViewMac::PageActionImageView*
-    LocationBarViewMac::GetPageActionImageView(ExtensionAction* page_action) {
-  DCHECK(page_action);
-  for (size_t i = 0; i < page_action_views_.Count(); ++i) {
-    if (page_action_views_.ViewAt(i)->page_action() == page_action)
-      return page_action_views_.ViewAt(i);
-  }
-  NOTREACHED();
-  return NULL;
+  return NSZeroPoint;
 }
 
 ExtensionAction* LocationBarViewMac::GetPageAction(size_t index) {
   if (index < page_action_views_.Count())
     return page_action_views_.ViewAt(index)->page_action();
   NOTREACHED();
   return NULL;
 }
 
 ExtensionAction* LocationBarViewMac::GetVisiblePageAction(size_t index) {
@@ skipping 596 matching lines @@
 
   // These need to change anytime the layout changes.
   // TODO(shess): Anytime the field editor might have changed, the
   // cursor rects almost certainly should have changed.  The tooltips
   // might change even when the rects don't change.
   [field_ resetFieldEditorFrameIfNeeded];
   [field_ updateCursorAndToolTipRects];
 
   [field_ setNeedsDisplay:YES];
 }