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

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

Issue 2807693002: Make LogoutButtonTray a regular View (Closed)
Patch Set: Rebased Created 3 years, 8 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
« no previous file with comments | « ash/system/tray/system_tray_item.h ('k') | ash/system/tray/tray_background_view.h » ('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/system/tray/system_tray.h" 7 #include "ash/system/tray/system_tray.h"
8 #include "ash/system/tray/system_tray_delegate.h" 8 #include "ash/system/tray/system_tray_delegate.h"
9 #include "ash/system/tray/tray_constants.h" 9 #include "ash/system/tray/tray_constants.h"
10 #include "base/timer/timer.h" 10 #include "base/timer/timer.h"
(...skipping 27 matching lines...) Expand all
38 void SystemTrayItem::TransitionDetailedView() { 38 void SystemTrayItem::TransitionDetailedView() {
39 transition_delay_timer_.Start( 39 transition_delay_timer_.Start(
40 FROM_HERE, 40 FROM_HERE,
41 base::TimeDelta::FromMilliseconds(kTrayDetailedViewTransitionDelayMs), 41 base::TimeDelta::FromMilliseconds(kTrayDetailedViewTransitionDelayMs),
42 base::Bind(&SystemTray::ShowDetailedView, base::Unretained(system_tray()), 42 base::Bind(&SystemTray::ShowDetailedView, base::Unretained(system_tray()),
43 this, 0, true, BUBBLE_USE_EXISTING)); 43 this, 0, true, BUBBLE_USE_EXISTING));
44 } 44 }
45 45
46 void SystemTrayItem::UpdateAfterLoginStatusChange(LoginStatus status) {} 46 void SystemTrayItem::UpdateAfterLoginStatusChange(LoginStatus status) {}
47 47
48 void SystemTrayItem::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) { 48 void SystemTrayItem::UpdateAfterShelfAlignmentChange() {}
49 }
50 49
51 void SystemTrayItem::ShowDetailedView(int for_seconds, bool activate) { 50 void SystemTrayItem::ShowDetailedView(int for_seconds, bool activate) {
52 system_tray()->ShowDetailedView(this, for_seconds, activate, 51 system_tray()->ShowDetailedView(this, for_seconds, activate,
53 BUBBLE_CREATE_NEW); 52 BUBBLE_CREATE_NEW);
54 } 53 }
55 54
56 void SystemTrayItem::SetDetailedViewCloseDelay(int for_seconds) { 55 void SystemTrayItem::SetDetailedViewCloseDelay(int for_seconds) {
57 system_tray()->SetDetailedViewCloseDelay(for_seconds); 56 system_tray()->SetDetailedViewCloseDelay(for_seconds);
58 } 57 }
59 58
60 void SystemTrayItem::HideDetailedView(bool animate) { 59 void SystemTrayItem::HideDetailedView(bool animate) {
61 system_tray()->HideDetailedView(this, animate); 60 system_tray()->HideDetailedView(this, animate);
62 } 61 }
63 62
64 bool SystemTrayItem::ShouldShowShelf() const { 63 bool SystemTrayItem::ShouldShowShelf() const {
65 return true; 64 return true;
66 } 65 }
67 66
68 } // namespace ash 67 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/tray/system_tray_item.h ('k') | ash/system/tray/tray_background_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698