| OLD | NEW |
| 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/window/client_view.h" | 5 #include "ui/views/window/client_view.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "ui/accessibility/ax_enums.h" |
| 8 #include "ui/accessibility/ax_view_state.h" | 9 #include "ui/accessibility/ax_view_state.h" |
| 9 #include "ui/base/hit_test.h" | 10 #include "ui/base/hit_test.h" |
| 10 #include "ui/views/widget/widget.h" | 11 #include "ui/views/widget/widget.h" |
| 11 #include "ui/views/widget/widget_delegate.h" | 12 #include "ui/views/widget/widget_delegate.h" |
| 12 | 13 |
| 13 namespace views { | 14 namespace views { |
| 14 | 15 |
| 15 // static | 16 // static |
| 16 const char ClientView::kViewClassName[] = | 17 const char ClientView::kViewClassName[] = |
| 17 "ui/views/window/ClientView"; | 18 "ui/views/window/ClientView"; |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 91 DCHECK(contents_view_); // |contents_view_| must be valid now! | 92 DCHECK(contents_view_); // |contents_view_| must be valid now! |
| 92 // Insert |contents_view_| at index 0 so it is first in the focus chain. | 93 // Insert |contents_view_| at index 0 so it is first in the focus chain. |
| 93 // (the OK/Cancel buttons are inserted before contents_view_) | 94 // (the OK/Cancel buttons are inserted before contents_view_) |
| 94 AddChildViewAt(contents_view_, 0); | 95 AddChildViewAt(contents_view_, 0); |
| 95 } else if (!details.is_add && details.child == contents_view_) { | 96 } else if (!details.is_add && details.child == contents_view_) { |
| 96 contents_view_ = nullptr; | 97 contents_view_ = nullptr; |
| 97 } | 98 } |
| 98 } | 99 } |
| 99 | 100 |
| 100 } // namespace views | 101 } // namespace views |
| OLD | NEW |