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

Unified Diff: ui/views/widget/widget_delegate.cc

Issue 293833002: Fix Widget::InitParams::activatable logic (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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
« ui/views/widget/widget_delegate.h ('K') | « ui/views/widget/widget_delegate.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/widget_delegate.cc
diff --git a/ui/views/widget/widget_delegate.cc b/ui/views/widget/widget_delegate.cc
index 7f0b2b0999352f865cadae517376b15bf13ada32..383462ab3a7760895b05d8f85a0750e55613c841 100644
--- a/ui/views/widget/widget_delegate.cc
+++ b/ui/views/widget/widget_delegate.cc
@@ -17,7 +17,8 @@ namespace views {
////////////////////////////////////////////////////////////////////////////////
// WidgetDelegate:
-WidgetDelegate::WidgetDelegate() : default_contents_view_(NULL) {
+WidgetDelegate::WidgetDelegate() : default_contents_view_(NULL),
sky 2014/05/20 17:43:20 nit: when you have multiple params wrap and indent
+ can_activate_(true) {
}
void WidgetDelegate::OnWidgetMove() {
@@ -50,7 +51,7 @@ bool WidgetDelegate::CanMaximize() const {
}
bool WidgetDelegate::CanActivate() const {
- return true;
+ return can_activate_;
}
ui::ModalType WidgetDelegate::GetModalType() const {
« ui/views/widget/widget_delegate.h ('K') | « ui/views/widget/widget_delegate.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698