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 "ash/system/brightness/tray_brightness.h" | 5 #include "ash/system/brightness/tray_brightness.h" |
6 | 6 |
7 #include "ash/accelerators/accelerator_controller.h" | 7 #include "ash/accelerators/accelerator_controller.h" |
| 8 #include "ash/ash_constants.h" |
8 #include "ash/shell.h" | 9 #include "ash/shell.h" |
9 #include "ash/system/brightness/brightness_control_delegate.h" | 10 #include "ash/system/brightness/brightness_control_delegate.h" |
10 #include "ash/system/tray/system_tray_delegate.h" | 11 #include "ash/system/tray/system_tray_delegate.h" |
11 #include "ash/system/tray/tray_constants.h" | 12 #include "ash/system/tray/tray_constants.h" |
12 #include "ash/system/tray/tray_views.h" | 13 #include "ash/system/tray/tray_views.h" |
13 #include "base/bind.h" | 14 #include "base/bind.h" |
14 #include "base/message_loop.h" | 15 #include "base/message_loop.h" |
15 #include "base/utf_string_conversions.h" | 16 #include "base/utf_string_conversions.h" |
16 #include "grit/ash_resources.h" | 17 #include "grit/ash_resources.h" |
17 #include "grit/ash_strings.h" | 18 #include "grit/ash_strings.h" |
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
201 return; | 202 return; |
202 | 203 |
203 if (brightness_view_) | 204 if (brightness_view_) |
204 SetDetailedViewCloseDelay(kTrayPopupAutoCloseDelayInSeconds); | 205 SetDetailedViewCloseDelay(kTrayPopupAutoCloseDelayInSeconds); |
205 else | 206 else |
206 PopupDetailedView(kTrayPopupAutoCloseDelayInSeconds, false); | 207 PopupDetailedView(kTrayPopupAutoCloseDelayInSeconds, false); |
207 } | 208 } |
208 | 209 |
209 } // namespace internal | 210 } // namespace internal |
210 } // namespace ash | 211 } // namespace ash |
OLD | NEW |