| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 #ifndef ASH_COMMON_SYSTEM_TRAY_TRI_VIEW_H_ | 5 #ifndef ASH_SYSTEM_TRAY_TRI_VIEW_H_ |
| 6 #define ASH_COMMON_SYSTEM_TRAY_TRI_VIEW_H_ | 6 #define ASH_SYSTEM_TRAY_TRI_VIEW_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "ash/ash_export.h" | 10 #include "ash/ash_export.h" |
| 11 #include "base/macros.h" | 11 #include "base/macros.h" |
| 12 #include "ui/gfx/geometry/insets.h" | 12 #include "ui/gfx/geometry/insets.h" |
| 13 #include "ui/gfx/geometry/size.h" | 13 #include "ui/gfx/geometry/size.h" |
| 14 #include "ui/views/view.h" | 14 #include "ui/views/view.h" |
| 15 | 15 |
| 16 namespace views { | 16 namespace views { |
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 // ViewHierarchyChanged() event override fails on a DCHECK. However, we need | 147 // ViewHierarchyChanged() event override fails on a DCHECK. However, we need |
| 148 // to manipulate the child views during construction/destruction so this flag | 148 // to manipulate the child views during construction/destruction so this flag |
| 149 // is used to disable the DCHECK during construction/destruction. | 149 // is used to disable the DCHECK during construction/destruction. |
| 150 bool enable_hierarchy_changed_dcheck_ = false; | 150 bool enable_hierarchy_changed_dcheck_ = false; |
| 151 | 151 |
| 152 DISALLOW_COPY_AND_ASSIGN(TriView); | 152 DISALLOW_COPY_AND_ASSIGN(TriView); |
| 153 }; | 153 }; |
| 154 | 154 |
| 155 } // namespace ash | 155 } // namespace ash |
| 156 | 156 |
| 157 #endif // ASH_COMMON_SYSTEM_TRAY_TRI_VIEW_H_ | 157 #endif // ASH_SYSTEM_TRAY_TRI_VIEW_H_ |
| OLD | NEW |