Ensure that a browser action is never passed to a function which expects a page action.

chrome/browser/cocoa/extensions/extension_action_context_menu.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/extensions/extension_action_context_menu.h"
 
 #include "app/l10n_util_mac.h"
 #include "base/sys_string_conversions.h"
 #include "base/task.h"
 #include "chrome/browser/browser_list.h"
@@ skipping 223 matching lines @@
                        NEW_FOREGROUND_TAB, PageTransition::LINK);
       break;
     }
     case kExtensionContextInspect: {
       BrowserWindowCocoa* window =
           static_cast<BrowserWindowCocoa*>(browser->window());
       ToolbarController* toolbarController =
           [window->cocoa_controller() toolbarController];
       LocationBarViewMac* locationBarView =
           [toolbarController locationBarBridge];
-      NSPoint popupPoint = locationBarView->GetPageActionBubblePoint(action_);
 
-      // If there was no matching page action, it was a browser action.
-      if (NSEqualPoints(popupPoint, NSZeroPoint)) {
+      NSPoint popupPoint = NSZeroPoint;
+      if (extension_->page_action() == action_) {
+        popupPoint = locationBarView->GetPageActionBubblePoint(action_);
+
+      } else if (extension_->browser_action() == action_) {
         BrowserActionsController* controller =
             [toolbarController browserActionsController];
         popupPoint = [controller popupPointForBrowserAction:extension_];
+
+      } else {
+        NOTREACHED() << "action_ is not a page action or browser action?";
       }
 
       int tabId = CurrentTabId();
       GURL url = action_->GetPopupUrl(tabId);
       DCHECK(url.is_valid());
       [ExtensionPopupController showURL:url
                               inBrowser:BrowserList::GetLastActive()
                              anchoredAt:popupPoint
                           arrowLocation:info_bubble::kTopRight
                                 devMode:YES];
       break;
     }
     default:
       NOTREACHED();
       break;
   }
 }
 
 - (BOOL)validateMenuItem:(NSMenuItem*)menuItem {
   if([menuItem isEqualTo:inspectorItem_.get()]) {
     return action_ && action_->HasPopup(CurrentTabId());
   }
   return YES;
 }
 
 @end