| OLD | NEW |
| 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/system/tray/system_tray_item.h" | 8 #include "ash/system/tray/system_tray_item.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "ui/gfx/display_observer.h" | 10 #include "ui/gfx/display_observer.h" |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 | 22 |
| 23 class TrayDisplay : public SystemTrayItem, | 23 class TrayDisplay : public SystemTrayItem, |
| 24 public chromeos::OutputConfigurator::Observer, | 24 public chromeos::OutputConfigurator::Observer, |
| 25 public gfx::DisplayObserver { | 25 public gfx::DisplayObserver { |
| 26 public: | 26 public: |
| 27 TrayDisplay(); | 27 TrayDisplay(); |
| 28 virtual ~TrayDisplay(); | 28 virtual ~TrayDisplay(); |
| 29 | 29 |
| 30 private: | 30 private: |
| 31 // Overridden from SystemTrayItem. | 31 // Overridden from SystemTrayItem. |
| 32 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; | 32 virtual views::View* CreateDefaultView(user::LoginStatus status, |
| 33 int bubble_width) OVERRIDE; |
| 33 virtual void DestroyDefaultView() OVERRIDE; | 34 virtual void DestroyDefaultView() OVERRIDE; |
| 34 | 35 |
| 35 // Overridden from aura::DisplayObserver | 36 // Overridden from aura::DisplayObserver |
| 36 virtual void OnDisplayBoundsChanged(const gfx::Display& display) OVERRIDE; | 37 virtual void OnDisplayBoundsChanged(const gfx::Display& display) OVERRIDE; |
| 37 virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE; | 38 virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE; |
| 38 virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE; | 39 virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE; |
| 39 | 40 |
| 40 // Overridden from chromeos::OutputConfigurator::Observer | 41 // Overridden from chromeos::OutputConfigurator::Observer |
| 41 virtual void OnDisplayModeChanged() OVERRIDE; | 42 virtual void OnDisplayModeChanged() OVERRIDE; |
| 42 | 43 |
| 43 DisplayView* default_; | 44 DisplayView* default_; |
| 44 | 45 |
| 45 DISALLOW_COPY_AND_ASSIGN(TrayDisplay); | 46 DISALLOW_COPY_AND_ASSIGN(TrayDisplay); |
| 46 }; | 47 }; |
| 47 | 48 |
| 48 } // namespace internal | 49 } // namespace internal |
| 49 } // namespace ash | 50 } // namespace ash |
| 50 | 51 |
| 51 #endif // ASH_SYSTEM_CHROMEOS_TRAY_DISPLAY_H_ | 52 #endif // ASH_SYSTEM_CHROMEOS_TRAY_DISPLAY_H_ |
| OLD | NEW |