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

Unified Diff: ui/views/bubble/bubble_delegate.cc

Issue 20871003: Fix BubbleFrameView title and close button patterns. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync and merge; add OVERRIDE mark. Created 7 years, 5 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 | « ui/views/bubble/bubble_delegate.h ('k') | ui/views/bubble/bubble_frame_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/bubble/bubble_delegate.cc
diff --git a/ui/views/bubble/bubble_delegate.cc b/ui/views/bubble/bubble_delegate.cc
index 32a7b542f471aa219bfa57028a8a871667593d45..40af6cf8d597b22706db16136fc2ff479a1e9fe2 100644
--- a/ui/views/bubble/bubble_delegate.cc
+++ b/ui/views/bubble/bubble_delegate.cc
@@ -66,6 +66,12 @@ class BubbleBorderDelegate : public WidgetDelegate,
// WidgetDelegate overrides:
virtual bool CanActivate() const OVERRIDE { return false; }
+ virtual string16 GetWindowTitle() const {
+ return bubble_->GetWindowTitle();
+ }
+ virtual bool ShouldShowCloseButton() const OVERRIDE {
+ return bubble_->ShouldShowCloseButton();
+ }
virtual void DeleteDelegate() OVERRIDE { delete this; }
virtual Widget* GetWidget() OVERRIDE { return widget_; }
virtual const Widget* GetWidget() const OVERRIDE { return widget_; }
@@ -192,6 +198,10 @@ bool BubbleDelegateView::CanActivate() const {
return !use_focusless();
}
+bool BubbleDelegateView::ShouldShowCloseButton() const {
+ return false;
+}
+
View* BubbleDelegateView::GetContentsView() {
return this;
}
« no previous file with comments | « ui/views/bubble/bubble_delegate.h ('k') | ui/views/bubble/bubble_frame_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698