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

Side by Side Diff: ash/common/system/tray/system_tray_item.h

Issue 2063813002: mash: Move SystemTrayImage and TrayImageItem to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@wmnotifier
Patch Set: rebase 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
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 #ifndef ASH_SYSTEM_TRAY_SYSTEM_TRAY_ITEM_H_ 5 #ifndef ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_ITEM_H_
6 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_ITEM_H_ 6 #define ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_ITEM_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/common/login_status.h"
9 #include "ash/common/shelf/shelf_types.h" 10 #include "ash/common/shelf/shelf_types.h"
10 #include "ash/system/user/login_status.h"
11 #include "base/compiler_specific.h"
12 #include "base/macros.h" 11 #include "base/macros.h"
13 12
14 namespace views { 13 namespace views {
15 class View; 14 class View;
16 } 15 }
17 16
18 namespace ash { 17 namespace ash {
19 class SystemTray; 18 class SystemTray;
20 class TrayItemView; 19 class TrayItemView;
21 20
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 110
112 private: 111 private:
113 SystemTray* system_tray_; 112 SystemTray* system_tray_;
114 bool restore_focus_; 113 bool restore_focus_;
115 114
116 DISALLOW_COPY_AND_ASSIGN(SystemTrayItem); 115 DISALLOW_COPY_AND_ASSIGN(SystemTrayItem);
117 }; 116 };
118 117
119 } // namespace ash 118 } // namespace ash
120 119
121 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_ITEM_H_ 120 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_ITEM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698