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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/views/widget/widget_delegate.h" 5 #include "ui/views/widget/widget_delegate.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "ui/gfx/image/image_skia.h" 8 #include "ui/gfx/image/image_skia.h"
9 #include "ui/views/bubble/bubble_delegate.h" 9 #include "ui/views/bubble/bubble_delegate.h"
10 #include "ui/views/view.h" 10 #include "ui/views/view.h"
11 #include "ui/views/views_delegate.h" 11 #include "ui/views/views_delegate.h"
12 #include "ui/views/widget/widget.h" 12 #include "ui/views/widget/widget.h"
13 #include "ui/views/window/client_view.h" 13 #include "ui/views/window/client_view.h"
14 14
15 namespace views { 15 namespace views {
16 16
17 //////////////////////////////////////////////////////////////////////////////// 17 ////////////////////////////////////////////////////////////////////////////////
18 // WidgetDelegate: 18 // WidgetDelegate:
19 19
20 WidgetDelegate::WidgetDelegate() : default_contents_view_(NULL) { 20 WidgetDelegate::WidgetDelegate() : default_contents_view_(NULL),
21 default_can_activate_(true) {
21 } 22 }
22 23
23 void WidgetDelegate::OnWidgetMove() { 24 void WidgetDelegate::OnWidgetMove() {
24 } 25 }
25 26
26 void WidgetDelegate::OnDisplayChanged() { 27 void WidgetDelegate::OnDisplayChanged() {
27 } 28 }
28 29
29 void WidgetDelegate::OnWorkAreaChanged() { 30 void WidgetDelegate::OnWorkAreaChanged() {
30 } 31 }
(...skipping 12 matching lines...) Expand all
43 44
44 bool WidgetDelegate::CanResize() const { 45 bool WidgetDelegate::CanResize() const {
45 return false; 46 return false;
46 } 47 }
47 48
48 bool WidgetDelegate::CanMaximize() const { 49 bool WidgetDelegate::CanMaximize() const {
49 return false; 50 return false;
50 } 51 }
51 52
52 bool WidgetDelegate::CanActivate() const { 53 bool WidgetDelegate::CanActivate() const {
53 return true; 54 return default_can_activate_;
54 } 55 }
55 56
56 ui::ModalType WidgetDelegate::GetModalType() const { 57 ui::ModalType WidgetDelegate::GetModalType() const {
57 return ui::MODAL_TYPE_NONE; 58 return ui::MODAL_TYPE_NONE;
58 } 59 }
59 60
60 ui::AXRole WidgetDelegate::GetAccessibleWindowRole() const { 61 ui::AXRole WidgetDelegate::GetAccessibleWindowRole() const {
61 return ui::AX_ROLE_WINDOW; 62 return ui::AX_ROLE_WINDOW;
62 } 63 }
63 64
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 191
191 Widget* WidgetDelegateView::GetWidget() { 192 Widget* WidgetDelegateView::GetWidget() {
192 return View::GetWidget(); 193 return View::GetWidget();
193 } 194 }
194 195
195 const Widget* WidgetDelegateView::GetWidget() const { 196 const Widget* WidgetDelegateView::GetWidget() const {
196 return View::GetWidget(); 197 return View::GetWidget();
197 } 198 }
198 199
199 } // namespace views 200 } // namespace views
OLDNEW
« 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