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

Side by Side Diff: ash/system/chromeos/tray_display.h

Issue 16046007: Shows the display info as a popup when a new display is connected. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: minor fix Created 7 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 | Annotate | Revision Log
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 "ash/display/display_controller.h"
8 #include "ash/system/tray/system_tray_item.h" 9 #include "ash/system/tray/system_tray_item.h"
9 #include "base/memory/scoped_ptr.h"
10 #include "ui/gfx/display_observer.h"
11
12 #if defined(OS_CHROMEOS)
13 #include "chromeos/display/output_configurator.h"
14 #endif
15 10
16 namespace views { 11 namespace views {
17 class View; 12 class View;
18 } 13 }
19 14
20 namespace ash { 15 namespace ash {
21 namespace internal { 16 namespace internal {
17
18 enum TrayDisplayMode {
19 TRAY_DISPLAY_SINGLE,
20 TRAY_DISPLAY_EXTENDED,
21 TRAY_DISPLAY_MIRRORED,
22 TRAY_DISPLAY_DOCKED,
23 };
24
22 class DisplayView; 25 class DisplayView;
23 26
24 class TrayDisplay : public SystemTrayItem, 27 class TrayDisplay : public SystemTrayItem,
25 #if defined(OS_CHROMEOS) 28 public DisplayController::Observer {
26 public chromeos::OutputConfigurator::Observer,
27 #endif
28 public gfx::DisplayObserver {
29 public: 29 public:
30 explicit TrayDisplay(SystemTray* system_tray); 30 explicit TrayDisplay(SystemTray* system_tray);
31 virtual ~TrayDisplay(); 31 virtual ~TrayDisplay();
32 32
33 private: 33 private:
34 // Overridden from SystemTrayItem. 34 // Overridden from SystemTrayItem.
35 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; 35 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE;
36 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE;
36 virtual void DestroyDefaultView() OVERRIDE; 37 virtual void DestroyDefaultView() OVERRIDE;
37 38
38 // Overridden from aura::DisplayObserver 39 // Overridden from DisplayControllerObserver:
39 virtual void OnDisplayBoundsChanged(const gfx::Display& display) OVERRIDE; 40 virtual void OnDisplayConfigurationChanged() OVERRIDE;
40 virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE;
41 virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE;
42
43 #if defined(OS_CHROMEOS)
44 // Overridden from chromeos::OutputConfigurator::Observer
45 virtual void OnDisplayModeChanged() OVERRIDE;
46 #endif
47 41
48 DisplayView* default_; 42 DisplayView* default_;
43 TrayDisplayMode current_mode_;
49 44
50 DISALLOW_COPY_AND_ASSIGN(TrayDisplay); 45 DISALLOW_COPY_AND_ASSIGN(TrayDisplay);
51 }; 46 };
52 47
53 } // namespace internal 48 } // namespace internal
54 } // namespace ash 49 } // namespace ash
55 50
56 #endif // ASH_SYSTEM_CHROMEOS_TRAY_DISPLAY_H_ 51 #endif // ASH_SYSTEM_CHROMEOS_TRAY_DISPLAY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698