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/tray_update.h" | 5 #include "ash/system/tray_update.h" |
6 | 6 |
7 #include "ash/root_window_controller.h" | 7 #include "ash/root_window_controller.h" |
8 #include "ash/shelf/shelf_layout_manager.h" | 8 #include "ash/shelf/shelf_layout_manager.h" |
9 #include "ash/shelf/shelf_widget.h" | 9 #include "ash/shelf/shelf_widget.h" |
10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
11 #include "ash/system/status_area_widget.h" | 11 #include "ash/system/status_area_widget.h" |
12 #include "ash/system/tray/fixed_sized_image_view.h" | 12 #include "ash/system/tray/fixed_sized_image_view.h" |
13 #include "ash/system/tray/system_tray.h" | 13 #include "ash/system/tray/system_tray.h" |
14 #include "ash/system/tray/system_tray_delegate.h" | 14 #include "ash/system/tray/system_tray_delegate.h" |
15 #include "ash/system/tray/system_tray_notifier.h" | 15 #include "ash/system/tray/system_tray_notifier.h" |
16 #include "ash/system/tray/tray_constants.h" | 16 #include "ash/system/tray/tray_constants.h" |
17 #include "base/time.h" | 17 #include "base/time/time.h" |
18 #include "base/timer.h" | 18 #include "base/timer/timer.h" |
19 #include "grit/ash_resources.h" | 19 #include "grit/ash_resources.h" |
20 #include "grit/ash_strings.h" | 20 #include "grit/ash_strings.h" |
21 #include "ui/aura/window.h" | 21 #include "ui/aura/window.h" |
22 #include "ui/base/resource/resource_bundle.h" | 22 #include "ui/base/resource/resource_bundle.h" |
23 #include "ui/compositor/layer.h" | 23 #include "ui/compositor/layer.h" |
24 #include "ui/compositor/layer_animation_observer.h" | 24 #include "ui/compositor/layer_animation_observer.h" |
25 #include "ui/compositor/layer_animation_sequence.h" | 25 #include "ui/compositor/layer_animation_sequence.h" |
26 #include "ui/gfx/image/image.h" | 26 #include "ui/gfx/image/image.h" |
27 #include "ui/views/controls/image_view.h" | 27 #include "ui/views/controls/image_view.h" |
28 #include "ui/views/controls/label.h" | 28 #include "ui/views/controls/label.h" |
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
196 tray_view()->SetVisible(true); | 196 tray_view()->SetVisible(true); |
197 if (!Shell::GetPrimaryRootWindowController()->shelf()->IsVisible() && | 197 if (!Shell::GetPrimaryRootWindowController()->shelf()->IsVisible() && |
198 !nagger_.get()) { | 198 !nagger_.get()) { |
199 // The shelf is not visible, and there is no nagger scheduled. | 199 // The shelf is not visible, and there is no nagger scheduled. |
200 nagger_.reset(new tray::UpdateNagger(this)); | 200 nagger_.reset(new tray::UpdateNagger(this)); |
201 } | 201 } |
202 } | 202 } |
203 | 203 |
204 } // namespace internal | 204 } // namespace internal |
205 } // namespace ash | 205 } // namespace ash |
OLD | NEW |