summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/pinned_contents_info_bubble.h
diff options
context:
space:
mode:
authordpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-07 07:12:43 +0000
committerdpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-07 07:12:43 +0000
commit1163119b66586270926d92066ca699b2873d4694 (patch)
tree6caba05f755539920de457788a25c854520c8684 /chrome/browser/views/pinned_contents_info_bubble.h
parentce80b5c9c1a1ecfa965c3e7a8f8381140047fcea (diff)
downloadchromium_src-1163119b66586270926d92066ca699b2873d4694.zip
chromium_src-1163119b66586270926d92066ca699b2873d4694.tar.gz
chromium_src-1163119b66586270926d92066ca699b2873d4694.tar.bz2
Put back info_bubble with left&right arrows.
Original CL: http://codereview.chromium.org/1820002 After submitting resources in separate CL, try servers pass on all platforms and locally tests all pass so submitting without any new changes. BUG=crosbug.com/2800 TEST=Should be no visible changes with info bubble, everything should work as before. TBR=pkasting Review URL: http://codereview.chromium.org/2012003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46663 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/pinned_contents_info_bubble.h')
-rw-r--r--chrome/browser/views/pinned_contents_info_bubble.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/chrome/browser/views/pinned_contents_info_bubble.h b/chrome/browser/views/pinned_contents_info_bubble.h
index 7ceb89b..d93b0e2 100644
--- a/chrome/browser/views/pinned_contents_info_bubble.h
+++ b/chrome/browser/views/pinned_contents_info_bubble.h
@@ -18,8 +18,8 @@ class PinnedContentsBorderContents : public BorderContents {
// BorderContents overrides:
virtual void SizeAndGetBounds(
const gfx::Rect& position_relative_to, // In screen coordinates
+ BubbleBorder::ArrowLocation arrow_location,
const gfx::Size& contents_size,
- bool prefer_arrow_on_right,
gfx::Rect* contents_bounds, // Returned in window coordinates
gfx::Rect* window_bounds); // Returned in screen coordinates
@@ -60,11 +60,13 @@ class PinnedContentsInfoBubble : public InfoBubble {
// order to anchor its contents. Once the InfoBubble has been anchored its
// arrow may be pointing to a slightly different |y| location than specified
// in |position_relative_to|.
- static PinnedContentsInfoBubble* Show(views::Window* parent,
- const gfx::Rect& position_relative_to,
- const gfx::Point& bubble_anchor_,
- views::View* contents,
- InfoBubbleDelegate* delegate);
+ static PinnedContentsInfoBubble* Show(
+ views::Widget* parent,
+ const gfx::Rect& position_relative_to,
+ BubbleBorder::ArrowLocation arrow_location,
+ const gfx::Point& bubble_anchor_,
+ views::View* contents,
+ InfoBubbleDelegate* delegate);
private:
explicit PinnedContentsInfoBubble(const gfx::Point& bubble_anchor)