Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1195)

Unified Diff: chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc

Issue 11030017: Add context to gfx::Screen calls in support of simultaneous desktop+ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix new addition Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
index 783bc3779ea8175e275546eddc15bada034d79dd..6c78bee8438b4f08fff429ad187235f7d6a78f7d 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
@@ -164,8 +164,8 @@ class BookmarkButton : public views::TextButton {
string16* tooltip) const OVERRIDE {
gfx::Point location(p);
ConvertPointToScreen(this, &location);
- *tooltip = BookmarkBarView::CreateToolTipForURLAndTitle(location, url_,
- text(), profile_);
+ *tooltip = BookmarkBarView::CreateToolTipForURLAndTitle(
+ location, url_, text(), profile_, GetWidget()->GetNativeView());
return !tooltip->empty();
}
@@ -537,9 +537,11 @@ string16 BookmarkBarView::CreateToolTipForURLAndTitle(
const gfx::Point& screen_loc,
const GURL& url,
const string16& title,
- Profile* profile) {
+ Profile* profile,
+ gfx::NativeView context) {
int max_width = views::TooltipManager::GetMaxWidth(screen_loc.x(),
- screen_loc.y());
+ screen_loc.y(),
+ context);
gfx::Font tt_font = views::TooltipManager::GetDefaultFont();
string16 result;
« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_bar_view.h ('k') | chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698