Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(692)

Side by Side Diff: ash/system/tray/system_tray_item.cc

Issue 10825264: Consolidate volume control code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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_item.h" 5 #include "ash/system/tray/system_tray_item.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/tray_constants.h" 9 #include "ash/system/tray/tray_constants.h"
10 #include "ash/system/tray/tray_item_view.h" 10 #include "ash/system/tray/tray_item_view.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 Shell::GetInstance()->system_tray()->ShowDetailedView(this, 0, true, 51 Shell::GetInstance()->system_tray()->ShowDetailedView(this, 0, true,
52 BUBBLE_USE_EXISTING); 52 BUBBLE_USE_EXISTING);
53 } 53 }
54 54
55 void SystemTrayItem::UpdateAfterLoginStatusChange(user::LoginStatus status) { 55 void SystemTrayItem::UpdateAfterLoginStatusChange(user::LoginStatus status) {
56 } 56 }
57 57
58 void SystemTrayItem::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) { 58 void SystemTrayItem::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
59 } 59 }
60 60
61 void SystemTrayItem::UpdateAfterAshInit() {
62 }
63
61 void SystemTrayItem::PopupDetailedView(int for_seconds, bool activate) { 64 void SystemTrayItem::PopupDetailedView(int for_seconds, bool activate) {
62 Shell::GetInstance()->system_tray()->ShowDetailedView( 65 Shell::GetInstance()->system_tray()->ShowDetailedView(
63 this, for_seconds, activate, BUBBLE_CREATE_NEW); 66 this, for_seconds, activate, BUBBLE_CREATE_NEW);
64 } 67 }
65 68
66 void SystemTrayItem::SetDetailedViewCloseDelay(int for_seconds) { 69 void SystemTrayItem::SetDetailedViewCloseDelay(int for_seconds) {
67 Shell::GetInstance()->system_tray()->SetDetailedViewCloseDelay(for_seconds); 70 Shell::GetInstance()->system_tray()->SetDetailedViewCloseDelay(for_seconds);
68 } 71 }
69 72
70 void SystemTrayItem::HideDetailedView() { 73 void SystemTrayItem::HideDetailedView() {
71 Shell::GetInstance()->system_tray()->HideDetailedView(this); 74 Shell::GetInstance()->system_tray()->HideDetailedView(this);
72 } 75 }
73 76
74 void SystemTrayItem::ShowNotificationView() { 77 void SystemTrayItem::ShowNotificationView() {
75 Shell::GetInstance()->system_tray()->ShowNotificationView(this); 78 Shell::GetInstance()->system_tray()->ShowNotificationView(this);
76 } 79 }
77 80
78 void SystemTrayItem::HideNotificationView() { 81 void SystemTrayItem::HideNotificationView() {
79 Shell::GetInstance()->system_tray()->HideNotificationView(this); 82 Shell::GetInstance()->system_tray()->HideNotificationView(this);
80 } 83 }
81 84
82 } // namespace ash 85 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698