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

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

Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1 (Closed)
Patch Set: rebase Created 3 years, 9 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_notifier.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/common/system/tray/system_tray_item.h" 5 #include "ash/system/tray/system_tray_item.h"
6 6
7 #include "ash/common/system/tray/system_tray.h" 7 #include "ash/system/tray/system_tray.h"
8 #include "ash/common/system/tray/system_tray_delegate.h" 8 #include "ash/system/tray/system_tray_delegate.h"
9 #include "ash/common/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"
11 #include "ui/views/view.h" 11 #include "ui/views/view.h"
12 12
13 namespace ash { 13 namespace ash {
14 14
15 SystemTrayItem::SystemTrayItem(SystemTray* system_tray, UmaType uma_type) 15 SystemTrayItem::SystemTrayItem(SystemTray* system_tray, UmaType uma_type)
16 : system_tray_(system_tray), uma_type_(uma_type), restore_focus_(false) {} 16 : system_tray_(system_tray), uma_type_(uma_type), restore_focus_(false) {}
17 17
18 SystemTrayItem::~SystemTrayItem() {} 18 SystemTrayItem::~SystemTrayItem() {}
19 19
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 59
60 void SystemTrayItem::HideDetailedView(bool animate) { 60 void SystemTrayItem::HideDetailedView(bool animate) {
61 system_tray()->HideDetailedView(this, animate); 61 system_tray()->HideDetailedView(this, animate);
62 } 62 }
63 63
64 bool SystemTrayItem::ShouldShowShelf() const { 64 bool SystemTrayItem::ShouldShowShelf() const {
65 return true; 65 return true;
66 } 66 }
67 67
68 } // namespace ash 68 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/tray/system_tray_item.h ('k') | ash/system/tray/system_tray_notifier.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698