| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 VIEWS_WINDOW_NON_CLIENT_VIEW_H_ | 5 #ifndef VIEWS_WINDOW_NON_CLIENT_VIEW_H_ |
| 6 #define VIEWS_WINDOW_NON_CLIENT_VIEW_H_ | 6 #define VIEWS_WINDOW_NON_CLIENT_VIEW_H_ |
| 7 | 7 |
| 8 #include "base/task.h" | 8 #include "base/task.h" |
| 9 #include "views/view.h" | 9 #include "views/view.h" |
| 10 #include "views/window/client_view.h" | 10 #include "views/window/client_view.h" |
| (...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 222 // A ClientView object or subclass, responsible for sizing the contents view | 222 // A ClientView object or subclass, responsible for sizing the contents view |
| 223 // of the window, hit testing and perhaps other tasks depending on the | 223 // of the window, hit testing and perhaps other tasks depending on the |
| 224 // implementation. | 224 // implementation. |
| 225 ClientView* client_view_; | 225 ClientView* client_view_; |
| 226 | 226 |
| 227 // The NonClientFrameView that renders the non-client portions of the window. | 227 // The NonClientFrameView that renders the non-client portions of the window. |
| 228 // This object is not owned by the view hierarchy because it can be replaced | 228 // This object is not owned by the view hierarchy because it can be replaced |
| 229 // dynamically as the system settings change. | 229 // dynamically as the system settings change. |
| 230 scoped_ptr<NonClientFrameView> frame_view_; | 230 scoped_ptr<NonClientFrameView> frame_view_; |
| 231 | 231 |
| 232 // The accessible name of this view. | |
| 233 std::wstring accessible_name_; | |
| 234 | |
| 235 DISALLOW_COPY_AND_ASSIGN(NonClientView); | 232 DISALLOW_COPY_AND_ASSIGN(NonClientView); |
| 236 }; | 233 }; |
| 237 | 234 |
| 238 } // namespace views | 235 } // namespace views |
| 239 | 236 |
| 240 #endif // #ifndef VIEWS_WINDOW_NON_CLIENT_VIEW_H_ | 237 #endif // #ifndef VIEWS_WINDOW_NON_CLIENT_VIEW_H_ |
| OLD | NEW |