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

Side by Side Diff: ash/system/chromeos/tray_display.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
« no previous file with comments | « ash/system/chromeos/tray_caps_lock.cc ('k') | ash/system/chromeos/tray_display.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 #ifndef ASH_SYSTEM_CHROMEOS_TRAY_DISPLAY_H_ 5 #ifndef ASH_SYSTEM_CHROMEOS_TRAY_DISPLAY_H_
6 #define ASH_SYSTEM_CHROMEOS_TRAY_DISPLAY_H_ 6 #define ASH_SYSTEM_CHROMEOS_TRAY_DISPLAY_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
11 #include "ash/display/display_controller.h" 11 #include "ash/display/display_controller.h"
12 #include "ash/display/display_info.h" 12 #include "ash/display/display_info.h"
13 #include "ash/system/tray/system_tray_item.h" 13 #include "ash/system/tray/system_tray_item.h"
14 #include "base/strings/string16.h" 14 #include "base/strings/string16.h"
15 #include "ui/views/view.h" 15 #include "ui/views/view.h"
16 16
17 namespace ash { 17 namespace ash {
18 class DisplayView;
19
18 namespace test { 20 namespace test {
19 class AshTestBase; 21 class AshTestBase;
20 } 22 }
21 23
22 namespace internal {
23 class DisplayView;
24
25 class ASH_EXPORT TrayDisplay : public SystemTrayItem, 24 class ASH_EXPORT TrayDisplay : public SystemTrayItem,
26 public DisplayController::Observer { 25 public DisplayController::Observer {
27 public: 26 public:
28 explicit TrayDisplay(SystemTray* system_tray); 27 explicit TrayDisplay(SystemTray* system_tray);
29 virtual ~TrayDisplay(); 28 virtual ~TrayDisplay();
30 29
31 // Overridden from DisplayControllerObserver: 30 // Overridden from DisplayControllerObserver:
32 virtual void OnDisplayConfigurationChanged() OVERRIDE; 31 virtual void OnDisplayConfigurationChanged() OVERRIDE;
33 32
34 private: 33 private:
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 const views::View* default_view() const { 66 const views::View* default_view() const {
68 return reinterpret_cast<views::View*>(default_); 67 return reinterpret_cast<views::View*>(default_);
69 } 68 }
70 69
71 DisplayView* default_; 70 DisplayView* default_;
72 DisplayInfoMap display_info_; 71 DisplayInfoMap display_info_;
73 72
74 DISALLOW_COPY_AND_ASSIGN(TrayDisplay); 73 DISALLOW_COPY_AND_ASSIGN(TrayDisplay);
75 }; 74 };
76 75
77 } // namespace internal
78 } // namespace ash 76 } // namespace ash
79 77
80 #endif // ASH_SYSTEM_CHROMEOS_TRAY_DISPLAY_H_ 78 #endif // ASH_SYSTEM_CHROMEOS_TRAY_DISPLAY_H_
OLDNEW
« no previous file with comments | « ash/system/chromeos/tray_caps_lock.cc ('k') | ash/system/chromeos/tray_display.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698