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

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

Issue 2041233005: Moves ash::user::LoginStatus to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix test Created 4 years, 6 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/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 "ash/system/tray/system_tray_delegate.h" 9 #include "ash/system/tray/system_tray_delegate.h"
10 #include "ui/views/view.h" 10 #include "ui/views/view.h"
11 11
12 namespace ash { 12 namespace ash {
13 13
14 SystemTrayItem::SystemTrayItem(SystemTray* system_tray) 14 SystemTrayItem::SystemTrayItem(SystemTray* system_tray)
15 : system_tray_(system_tray), 15 : system_tray_(system_tray),
16 restore_focus_(false) { 16 restore_focus_(false) {
17 } 17 }
18 18
19 SystemTrayItem::~SystemTrayItem() { 19 SystemTrayItem::~SystemTrayItem() {
20 } 20 }
21 21
22 views::View* SystemTrayItem::CreateTrayView(user::LoginStatus status) { 22 views::View* SystemTrayItem::CreateTrayView(LoginStatus status) {
23 return NULL; 23 return NULL;
24 } 24 }
25 25
26 views::View* SystemTrayItem::CreateDefaultView(user::LoginStatus status) { 26 views::View* SystemTrayItem::CreateDefaultView(LoginStatus status) {
27 return NULL; 27 return NULL;
28 } 28 }
29 29
30 views::View* SystemTrayItem::CreateDetailedView(user::LoginStatus status) { 30 views::View* SystemTrayItem::CreateDetailedView(LoginStatus status) {
31 return NULL; 31 return NULL;
32 } 32 }
33 33
34 views::View* SystemTrayItem::CreateNotificationView(user::LoginStatus status) { 34 views::View* SystemTrayItem::CreateNotificationView(LoginStatus status) {
35 return NULL; 35 return NULL;
36 } 36 }
37 37
38 void SystemTrayItem::DestroyTrayView() { 38 void SystemTrayItem::DestroyTrayView() {
39 } 39 }
40 40
41 void SystemTrayItem::DestroyDefaultView() { 41 void SystemTrayItem::DestroyDefaultView() {
42 } 42 }
43 43
44 void SystemTrayItem::DestroyDetailedView() { 44 void SystemTrayItem::DestroyDetailedView() {
45 } 45 }
46 46
47 void SystemTrayItem::DestroyNotificationView() { 47 void SystemTrayItem::DestroyNotificationView() {
48 } 48 }
49 49
50 void SystemTrayItem::TransitionDetailedView() { 50 void SystemTrayItem::TransitionDetailedView() {
51 system_tray()->ShowDetailedView(this, 0, true, BUBBLE_USE_EXISTING); 51 system_tray()->ShowDetailedView(this, 0, true, BUBBLE_USE_EXISTING);
52 } 52 }
53 53
54 void SystemTrayItem::UpdateAfterLoginStatusChange(user::LoginStatus status) { 54 void SystemTrayItem::UpdateAfterLoginStatusChange(LoginStatus status) {}
55 }
56 55
57 void SystemTrayItem::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) { 56 void SystemTrayItem::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
58 } 57 }
59 58
60 void SystemTrayItem::PopupDetailedView(int for_seconds, bool activate) { 59 void SystemTrayItem::PopupDetailedView(int for_seconds, bool activate) {
61 system_tray()->ShowDetailedView( 60 system_tray()->ShowDetailedView(
62 this, for_seconds, activate, BUBBLE_CREATE_NEW); 61 this, for_seconds, activate, BUBBLE_CREATE_NEW);
63 } 62 }
64 63
65 void SystemTrayItem::SetDetailedViewCloseDelay(int for_seconds) { 64 void SystemTrayItem::SetDetailedViewCloseDelay(int for_seconds) {
(...skipping 14 matching lines...) Expand all
80 79
81 bool SystemTrayItem::ShouldHideArrow() const { 80 bool SystemTrayItem::ShouldHideArrow() const {
82 return false; 81 return false;
83 } 82 }
84 83
85 bool SystemTrayItem::ShouldShowShelf() const { 84 bool SystemTrayItem::ShouldShowShelf() const {
86 return true; 85 return true;
87 } 86 }
88 87
89 } // namespace ash 88 } // 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