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

Unified Diff: chrome/browser/views/status_bubble_views.cc

Issue 155026: Fix the current remaining Views-GTK compile and linker errors. (Closed)
Patch Set: New patch Created 11 years, 6 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
« no previous file with comments | « chrome/browser/views/dialog_stubs_gtk.cc ('k') | chrome/chrome.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/views/status_bubble_views.cc
diff --git a/chrome/browser/views/status_bubble_views.cc b/chrome/browser/views/status_bubble_views.cc
index 5afa4fbc7262024a38c7e3d5e87e893b2d8858b6..696b90ef85be3d12b9b858eacfd64aef2f56e571 100644
--- a/chrome/browser/views/status_bubble_views.cc
+++ b/chrome/browser/views/status_bubble_views.cc
@@ -477,8 +477,8 @@ class StatusBubbleViews::StatusViewExpander : public Animation,
public:
StatusViewExpander(StatusBubble* status_bubble, StatusView* status_view)
: Animation(kFramerate, this),
- status_bubble_(status_bubble),
status_view_(status_view),
+ status_bubble_(status_bubble),
expansion_start_(0),
expansion_end_(0) {
}
@@ -844,9 +844,14 @@ int StatusBubbleViews::GetStandardStatusBubbleWidth() {
int StatusBubbleViews::GetMaxStatusBubbleWidth() {
gfx::Rect frame_bounds;
frame_->GetBounds(&frame_bounds, false);
+#if defined(OS_WIN)
return static_cast<int>(frame_bounds.width() - (kShadowThickness * 2) -
kTextPositionX - kTextHorizPadding - 1 -
views::NativeScrollBar::GetVerticalScrollBarWidth());
+#else
+ NOTIMPLEMENTED();
+ return 10;
+#endif
}
void StatusBubbleViews::SetBubbleWidth(int width) {
« no previous file with comments | « chrome/browser/views/dialog_stubs_gtk.cc ('k') | chrome/chrome.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698