diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-18 18:32:45 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-11-18 18:38:07 +0000 |
| commit | 513209b27ff55e2841eac0e4120199c23acce758 (patch) | |
| tree | aeba30bb08c5f47c57003544e378a377c297eee6 /chrome/browser/gtk/status_bubble_gtk.cc | |
| parent | 164f7496de0fbee436b385a79ead9e3cb81a50c1 (diff) | |
| download | external_chromium-513209b27ff55e2841eac0e4120199c23acce758.zip external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.gz external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.bz2 | |
Merge Chromium at r65505: Initial merge by git.
Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
Diffstat (limited to 'chrome/browser/gtk/status_bubble_gtk.cc')
| -rw-r--r-- | chrome/browser/gtk/status_bubble_gtk.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/gtk/status_bubble_gtk.cc b/chrome/browser/gtk/status_bubble_gtk.cc index bc6f9b3..fbb8989 100644 --- a/chrome/browser/gtk/status_bubble_gtk.cc +++ b/chrome/browser/gtk/status_bubble_gtk.cc @@ -17,7 +17,6 @@ #include "chrome/browser/gtk/rounded_window.h" #include "chrome/browser/gtk/slide_animator_gtk.h" #include "chrome/common/notification_service.h" -#include "gfx/gtk_util.h" namespace { @@ -106,8 +105,8 @@ void StatusBubbleGtk::SetStatusTextToURL() { // TODO(tc): We don't actually use gfx::Font as the font in the status // bubble. We should extend gfx::ElideUrl to take some sort of pango font. - url_text_ = WideToUTF8(gfx::ElideUrl(url_, gfx::Font(), desired_width, - UTF16ToWideHack(languages_))); + url_text_ = UTF16ToUTF8(gfx::ElideUrl(url_, gfx::Font(), desired_width, + UTF16ToWideHack(languages_))); SetStatusTextTo(url_text_); } @@ -251,7 +250,7 @@ void StatusBubbleGtk::InitWidgets() { container_.Own(gtk_event_box_new()); gtk_util::ActAsRoundedWindow( - container_.get(), gfx::kGdkWhite, kCornerSize, + container_.get(), gtk_util::kGdkWhite, kCornerSize, gtk_util::ROUNDED_TOP_RIGHT, gtk_util::BORDER_TOP | gtk_util::BORDER_RIGHT); gtk_widget_set_name(container_.get(), "status-bubble"); |