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

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

Issue 10384178: ash: Make sure all the sub-popups retain the same height as the main popup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 7 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
« no previous file with comments | « ash/system/tray/system_tray_item.h ('k') | ash/system/tray/system_tray_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "ui/views/view.h" 9 #include "ui/views/view.h"
10 10
(...skipping 26 matching lines...) Expand all
37 37
38 void SystemTrayItem::DestroyDefaultView() { 38 void SystemTrayItem::DestroyDefaultView() {
39 } 39 }
40 40
41 void SystemTrayItem::DestroyDetailedView() { 41 void SystemTrayItem::DestroyDetailedView() {
42 } 42 }
43 43
44 void SystemTrayItem::DestroyNotificationView() { 44 void SystemTrayItem::DestroyNotificationView() {
45 } 45 }
46 46
47 void SystemTrayItem::TransitionDetailedView() {
48 Shell::GetInstance()->tray()->ShowDetailedView(this, 0, true,
49 BUBBLE_USE_EXISTING);
50 }
51
47 void SystemTrayItem::PopupDetailedView(int for_seconds, bool activate) { 52 void SystemTrayItem::PopupDetailedView(int for_seconds, bool activate) {
48 Shell::GetInstance()->tray()->ShowDetailedView(this, for_seconds, activate); 53 Shell::GetInstance()->tray()->ShowDetailedView(this, for_seconds, activate,
54 BUBBLE_CREATE_NEW);
49 } 55 }
50 56
51 void SystemTrayItem::SetDetailedViewCloseDelay(int for_seconds) { 57 void SystemTrayItem::SetDetailedViewCloseDelay(int for_seconds) {
52 Shell::GetInstance()->tray()->SetDetailedViewCloseDelay(for_seconds); 58 Shell::GetInstance()->tray()->SetDetailedViewCloseDelay(for_seconds);
53 } 59 }
54 60
55 void SystemTrayItem::ShowNotificationView() { 61 void SystemTrayItem::ShowNotificationView() {
56 Shell::GetInstance()->tray()->ShowNotificationView(this); 62 Shell::GetInstance()->tray()->ShowNotificationView(this);
57 } 63 }
58 64
59 void SystemTrayItem::HideNotificationView() { 65 void SystemTrayItem::HideNotificationView() {
60 Shell::GetInstance()->tray()->HideNotificationView(this); 66 Shell::GetInstance()->tray()->HideNotificationView(this);
61 } 67 }
62 68
63 } // namespace ash 69 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/tray/system_tray_item.h ('k') | ash/system/tray/system_tray_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698