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 CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_CONTAINER_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_CONTAINER_H_ |
6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_CONTAINER_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_CONTAINER_H_ |
7 | 7 |
8 #include "third_party/skia/include/core/SkColor.h" | 8 #include "third_party/skia/include/core/SkColor.h" |
9 #include "ui/views/view.h" | |
10 #include "ui/views/animation/bounds_animator.h" | 9 #include "ui/views/animation/bounds_animator.h" |
11 #include "ui/views/animation/bounds_animator_observer.h" | 10 #include "ui/views/animation/bounds_animator_observer.h" |
| 11 #include "ui/views/view.h" |
12 | 12 |
13 class LocationBarView; | 13 class LocationBarView; |
14 | 14 |
15 namespace views { | 15 namespace views { |
16 class NativeViewHost; | 16 class NativeViewHost; |
17 } | 17 } |
18 | 18 |
19 // LocationBarContainer contains the LocationBarView. Under aura it directly | 19 // LocationBarContainer contains the LocationBarView. Under aura it directly |
20 // contains the LocationBarView, on windows an intermediary widget is used. The | 20 // contains the LocationBarView, on windows an intermediary widget is used. The |
21 // intermediary widget is used so that LocationBarContainer can be placed on top | 21 // intermediary widget is used so that LocationBarContainer can be placed on top |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
85 views::NativeViewHost* native_view_host_; | 85 views::NativeViewHost* native_view_host_; |
86 | 86 |
87 bool in_toolbar_; | 87 bool in_toolbar_; |
88 | 88 |
89 bool instant_extended_api_enabled_; | 89 bool instant_extended_api_enabled_; |
90 | 90 |
91 DISALLOW_COPY_AND_ASSIGN(LocationBarContainer); | 91 DISALLOW_COPY_AND_ASSIGN(LocationBarContainer); |
92 }; | 92 }; |
93 | 93 |
94 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_CONTAINER_H_ | 94 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_CONTAINER_H_ |
OLD | NEW |