| 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 #ifndef UI_APP_LIST_CONTENTS_VIEW_H_ | 5 #ifndef UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_ |
| 6 #define UI_APP_LIST_CONTENTS_VIEW_H_ | 6 #define UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_ |
| 7 | 7 |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| 11 #include "ui/views/view.h" | 11 #include "ui/views/view.h" |
| 12 | 12 |
| 13 namespace views { | 13 namespace views { |
| 14 class BoundsAnimator; | 14 class BoundsAnimator; |
| 15 class ViewModel; | 15 class ViewModel; |
| 16 } | 16 } |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 PaginationModel* pagination_model_; // Owned by AppListController. | 64 PaginationModel* pagination_model_; // Owned by AppListController. |
| 65 | 65 |
| 66 scoped_ptr<views::ViewModel> view_model_; | 66 scoped_ptr<views::ViewModel> view_model_; |
| 67 scoped_ptr<views::BoundsAnimator> bounds_animator_; | 67 scoped_ptr<views::BoundsAnimator> bounds_animator_; |
| 68 | 68 |
| 69 DISALLOW_COPY_AND_ASSIGN(ContentsView); | 69 DISALLOW_COPY_AND_ASSIGN(ContentsView); |
| 70 }; | 70 }; |
| 71 | 71 |
| 72 } // namespace app_list | 72 } // namespace app_list |
| 73 | 73 |
| 74 #endif // UI_APP_LIST_CONTENTS_VIEW_H_ | 74 #endif // UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_ |
| OLD | NEW |