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/system_tray_bubble.h" | 5 #include "ash/system/tray/system_tray_bubble.h" |
6 | 6 |
7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
8 #include "ash/system/tray/system_tray.h" | 8 #include "ash/system/tray/system_tray.h" |
9 #include "ash/system/tray/system_tray_delegate.h" | 9 #include "ash/system/tray/system_tray_delegate.h" |
10 #include "ash/system/tray/system_tray_item.h" | 10 #include "ash/system/tray/system_tray_item.h" |
(...skipping 28 matching lines...) Expand all Loading... |
39 const int kSwipeDelayMS = 150; | 39 const int kSwipeDelayMS = 150; |
40 | 40 |
41 // Implicit animation observer that deletes itself and the layer at the end of | 41 // Implicit animation observer that deletes itself and the layer at the end of |
42 // the animation. | 42 // the animation. |
43 class AnimationObserverDeleteLayer : public ui::ImplicitAnimationObserver { | 43 class AnimationObserverDeleteLayer : public ui::ImplicitAnimationObserver { |
44 public: | 44 public: |
45 explicit AnimationObserverDeleteLayer(ui::Layer* layer) | 45 explicit AnimationObserverDeleteLayer(ui::Layer* layer) |
46 : layer_(layer) { | 46 : layer_(layer) { |
47 } | 47 } |
48 | 48 |
49 virtual ~AnimationObserverDeleteLayer() { | 49 ~AnimationObserverDeleteLayer() override {} |
50 } | |
51 | 50 |
52 virtual void OnImplicitAnimationsCompleted() override { | 51 void OnImplicitAnimationsCompleted() override { |
53 base::MessageLoopForUI::current()->DeleteSoon(FROM_HERE, this); | 52 base::MessageLoopForUI::current()->DeleteSoon(FROM_HERE, this); |
54 } | 53 } |
55 | 54 |
56 private: | 55 private: |
57 scoped_ptr<ui::Layer> layer_; | 56 scoped_ptr<ui::Layer> layer_; |
58 | 57 |
59 DISALLOW_COPY_AND_ASSIGN(AnimationObserverDeleteLayer); | 58 DISALLOW_COPY_AND_ASSIGN(AnimationObserverDeleteLayer); |
60 }; | 59 }; |
61 | 60 |
62 } // namespace | 61 } // namespace |
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
317 // 2 items, which are the bottom header row and the one just above it. | 316 // 2 items, which are the bottom header row and the one just above it. |
318 bubble_view_->AddChildView(new TrayPopupItemContainer( | 317 bubble_view_->AddChildView(new TrayPopupItemContainer( |
319 item_views[i], is_default_bubble, | 318 item_views[i], is_default_bubble, |
320 is_default_bubble && (i < item_views.size() - 2))); | 319 is_default_bubble && (i < item_views.size() - 2))); |
321 } | 320 } |
322 if (focus_view) | 321 if (focus_view) |
323 focus_view->RequestFocus(); | 322 focus_view->RequestFocus(); |
324 } | 323 } |
325 | 324 |
326 } // namespace ash | 325 } // namespace ash |
OLD | NEW |