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

Side by Side Diff: ash/system/chromeos/screen_security/screen_tray_item.h

Issue 224113005: Eliminate ash::internal namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_SCREEN_TRAY_ITEM_H_ 5 #ifndef ASH_SYSTEM_CHROMEOS_SCREEN_TRAY_ITEM_H_
6 #define ASH_SYSTEM_CHROMEOS_SCREEN_TRAY_ITEM_H_ 6 #define ASH_SYSTEM_CHROMEOS_SCREEN_TRAY_ITEM_H_
7 7
8 #include "ash/system/tray/system_tray.h" 8 #include "ash/system/tray/system_tray.h"
9 #include "ash/system/tray/system_tray_item.h" 9 #include "ash/system/tray/system_tray_item.h"
10 #include "ash/system/tray/system_tray_notifier.h" 10 #include "ash/system/tray/system_tray_notifier.h"
11 #include "ash/system/tray/tray_item_view.h" 11 #include "ash/system/tray/tray_item_view.h"
12 #include "ash/system/tray/tray_notification_view.h" 12 #include "ash/system/tray/tray_notification_view.h"
13 #include "ash/system/tray/tray_popup_label_button.h" 13 #include "ash/system/tray/tray_popup_label_button.h"
14 #include "ui/message_center/notification_delegate.h" 14 #include "ui/message_center/notification_delegate.h"
15 #include "ui/views/controls/button/button.h" 15 #include "ui/views/controls/button/button.h"
16 #include "ui/views/controls/image_view.h" 16 #include "ui/views/controls/image_view.h"
17 17
18 namespace views { 18 namespace views {
19 class View; 19 class View;
20 } 20 }
21 21
22 namespace ash { 22 namespace ash {
23 namespace internal {
24
25 class ScreenTrayItem; 23 class ScreenTrayItem;
26 24
27 namespace tray { 25 namespace tray {
28 26
29 class ScreenTrayView : public TrayItemView { 27 class ScreenTrayView : public TrayItemView {
30 public: 28 public:
31 ScreenTrayView(ScreenTrayItem* screen_tray_item, int icon_id); 29 ScreenTrayView(ScreenTrayItem* screen_tray_item, int icon_id);
32 virtual ~ScreenTrayView(); 30 virtual ~ScreenTrayView();
33 31
34 void Update(); 32 void Update();
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 132
135 private: 133 private:
136 tray::ScreenTrayView* tray_view_; 134 tray::ScreenTrayView* tray_view_;
137 tray::ScreenStatusView* default_view_; 135 tray::ScreenStatusView* default_view_;
138 bool is_started_; 136 bool is_started_;
139 base::Closure stop_callback_; 137 base::Closure stop_callback_;
140 138
141 DISALLOW_COPY_AND_ASSIGN(ScreenTrayItem); 139 DISALLOW_COPY_AND_ASSIGN(ScreenTrayItem);
142 }; 140 };
143 141
144 } // namespace internal
145 } // namespace ash 142 } // namespace ash
146 143
147 #endif // ASH_SYSTEM_CHROMEOS_SCREEN_TRAY_ITEM_H_ 144 #endif // ASH_SYSTEM_CHROMEOS_SCREEN_TRAY_ITEM_H_
OLDNEW
« no previous file with comments | « ash/system/chromeos/screen_security/screen_share_tray_item.cc ('k') | ash/system/chromeos/screen_security/screen_tray_item.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698