| 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 "chrome/browser/ui/views/location_bar/location_bar_container.h" | 5 #include "chrome/browser/ui/views/location_bar/location_bar_container.h" |
| 6 | 6 |
| 7 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" | 7 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" |
| 8 #include "chrome/browser/ui/webui/instant_ui.h" | 8 #include "chrome/browser/ui/webui/instant_ui.h" |
| 9 #include "ui/base/event.h" | 9 #include "ui/base/events/event.h" |
| 10 #include "ui/views/background.h" | 10 #include "ui/views/background.h" |
| 11 #include "ui/views/layout/fill_layout.h" | 11 #include "ui/views/layout/fill_layout.h" |
| 12 | 12 |
| 13 namespace { | 13 namespace { |
| 14 | 14 |
| 15 // Duration of the animations used by this class (AnimateTo()). | 15 // Duration of the animations used by this class (AnimateTo()). |
| 16 const int kAnimationDuration = 180; | 16 const int kAnimationDuration = 180; |
| 17 | 17 |
| 18 } | 18 } |
| 19 | 19 |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 | 79 |
| 80 void LocationBarContainer::OnBoundsAnimatorDone( | 80 void LocationBarContainer::OnBoundsAnimatorDone( |
| 81 views::BoundsAnimator* animator) { | 81 views::BoundsAnimator* animator) { |
| 82 SetInToolbar(true); | 82 SetInToolbar(true); |
| 83 } | 83 } |
| 84 | 84 |
| 85 // static | 85 // static |
| 86 int LocationBarContainer::GetAnimationDuration() { | 86 int LocationBarContainer::GetAnimationDuration() { |
| 87 return kAnimationDuration * InstantUI::GetSlowAnimationScaleFactor(); | 87 return kAnimationDuration * InstantUI::GetSlowAnimationScaleFactor(); |
| 88 } | 88 } |
| OLD | NEW |