OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/chromeos/setting_level_bubble.h" | 5 #include "chrome/browser/chromeos/setting_level_bubble.h" |
6 | 6 |
7 #include <gdk/gdk.h> | 7 #include <gdk/gdk.h> |
8 | 8 |
9 #include "base/timer.h" | 9 #include "base/timer.h" |
10 #include "chrome/browser/chromeos/login/background_view.h" | 10 #include "chrome/browser/chromeos/login/background_view.h" |
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
123 monitor_area.bottom() - view_size.height() / 2 - kBubbleBottomGap, | 123 monitor_area.bottom() - view_size.height() / 2 - kBubbleBottomGap, |
124 0, 0); | 124 0, 0); |
125 | 125 |
126 // ShowFocusless doesn't set ESC accelerator. | 126 // ShowFocusless doesn't set ESC accelerator. |
127 bubble_ = Bubble::ShowFocusless(parent_widget, | 127 bubble_ = Bubble::ShowFocusless(parent_widget, |
128 position_relative_to, | 128 position_relative_to, |
129 BubbleBorder::FLOAT, | 129 BubbleBorder::FLOAT, |
130 view_, // contents | 130 view_, // contents |
131 this, // delegate | 131 this, // delegate |
132 true); // show while screen is locked | 132 true); // show while screen is locked |
| 133 bubble_->set_fade_away_on_close(true); |
133 } else { | 134 } else { |
134 DCHECK(view_); | 135 DCHECK(view_); |
135 timeout_timer_.Stop(); | 136 timeout_timer_.Stop(); |
136 view_->SetIcon(icon); | 137 view_->SetIcon(icon); |
137 } | 138 } |
138 | 139 |
139 view_->SetEnabled(enabled); | 140 view_->SetEnabled(enabled); |
140 | 141 |
141 if (animation_.is_animating()) | 142 if (animation_.is_animating()) |
142 animation_.End(); | 143 animation_.End(); |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
199 void SettingLevelBubble::AnimationProgressed(const ui::Animation* animation) { | 200 void SettingLevelBubble::AnimationProgressed(const ui::Animation* animation) { |
200 if (view_) { | 201 if (view_) { |
201 view_->SetLevel( | 202 view_->SetLevel( |
202 ui::Tween::ValueBetween(animation->GetCurrentValue(), | 203 ui::Tween::ValueBetween(animation->GetCurrentValue(), |
203 previous_percent_, | 204 previous_percent_, |
204 current_percent_)); | 205 current_percent_)); |
205 } | 206 } |
206 } | 207 } |
207 | 208 |
208 } // namespace chromeos | 209 } // namespace chromeos |
OLD | NEW |