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

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

Issue 2108793002: mash: Convert system tray logout button to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more review comments, fix mash_unittests Created 4 years, 5 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_CHROMEOS_LABEL_TRAY_VIEW_H_ 5 #ifndef ASH_COMMON_SYSTEM_TRAY_LABEL_TRAY_VIEW_H_
6 #define ASH_SYSTEM_CHROMEOS_LABEL_TRAY_VIEW_H_ 6 #define ASH_COMMON_SYSTEM_TRAY_LABEL_TRAY_VIEW_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/strings/string16.h" 9 #include "base/strings/string16.h"
10 #include "ui/views/view.h" 10 #include "ui/views/view.h"
11 11
12 namespace ash { 12 namespace ash {
13 13
14 class ViewClickListener; 14 class ViewClickListener;
15 15
16 // View for simple information in tray. Automatically hides when message is 16 // View for simple information in tray. Automatically hides when message is
(...skipping 10 matching lines...) Expand all
27 27
28 ViewClickListener* click_listener_; 28 ViewClickListener* click_listener_;
29 int icon_resource_id_; 29 int icon_resource_id_;
30 base::string16 message_; 30 base::string16 message_;
31 31
32 DISALLOW_COPY_AND_ASSIGN(LabelTrayView); 32 DISALLOW_COPY_AND_ASSIGN(LabelTrayView);
33 }; 33 };
34 34
35 } // namespace ash 35 } // namespace ash
36 36
37 #endif // ASH_SYSTEM_CHROMEOS_LABEL_TRAY_VIEW_H_ 37 #endif // ASH_COMMON_SYSTEM_TRAY_LABEL_TRAY_VIEW_H_
OLDNEW
« no previous file with comments | « ash/common/system/chromeos/session/tray_session_length_limit_unittest.cc ('k') | ash/common/system/tray/label_tray_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698