Merge 54839 - [Mac] Adjust browser-action and content-setting popup points...

chrome/browser/cocoa/location_bar/content_setting_decoration.h

 // 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.
 
 #ifndef CHROME_BROWSER_COCOA_LOCATION_BAR_CONTENT_SETTING_DECORATION_H_
 #define CHROME_BROWSER_COCOA_LOCATION_BAR_CONTENT_SETTING_DECORATION_H_
 
 #include "base/scoped_ptr.h"
 #import "chrome/browser/cocoa/location_bar/image_decoration.h"
 #include "chrome/common/content_settings_types.h"
@@ skipping 15 matching lines @@
 
   // Updates the image and visibility state based on the supplied TabContents.
   void UpdateFromTabContents(const TabContents* tab_contents);
 
   // Overridden from |LocationBarDecoration|
   virtual bool AcceptsMousePress() { return true; }
   virtual bool OnMousePressed(NSRect frame);
   virtual NSString* GetToolTip();
 
  private:
+  // Helper to get where the bubble point should land.  Similar to
+  // |PageActionDecoration| or |StarDecoration| (|LocationBarViewMac|
+  // calls those).
+  NSPoint GetBubblePointInFrame(NSRect frame);
+
   void SetToolTip(NSString* tooltip);
 
   scoped_ptr<ContentSettingImageModel> content_setting_image_model_;
 
   LocationBarViewMac* owner_;  // weak
   Profile* profile_;  // weak
 
   scoped_nsobject<NSString> tooltip_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentSettingDecoration);
 };
 
 #endif  // CHROME_BROWSER_COCOA_LOCATION_BAR_CONTENT_SETTING_DECORATION_H_