Chromium Code Reviews| Index: ash/system/chromeos/screen_layout_observer.h |
| diff --git a/ash/system/chromeos/tray_display.h b/ash/system/chromeos/screen_layout_observer.h |
| similarity index 69% |
| rename from ash/system/chromeos/tray_display.h |
| rename to ash/system/chromeos/screen_layout_observer.h |
| index c7e55eabe21c922914f32965d0bc823d3dc17140..9cc044ecbad1d1f4688da3332e25ddd4588e73ae 100644 |
| --- a/ash/system/chromeos/tray_display.h |
| +++ b/ash/system/chromeos/screen_layout_observer.h |
| @@ -2,8 +2,8 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| -#ifndef ASH_SYSTEM_CHROMEOS_TRAY_DISPLAY_H_ |
| -#define ASH_SYSTEM_CHROMEOS_TRAY_DISPLAY_H_ |
| +#ifndef ASH_SYSTEM_CHROMEOS_SCREEN_LAYOUT_OBSERVER_H_ |
| +#define ASH_SYSTEM_CHROMEOS_SCREEN_LAYOUT_OBSERVER_H_ |
| #include <stdint.h> |
| @@ -21,16 +21,16 @@ namespace ash { |
| class DisplayView; |
| -class ASH_EXPORT TrayDisplay : public SystemTrayItem, public WmDisplayObserver { |
| +class ASH_EXPORT ScreenLayoutObserver : public WmDisplayObserver { |
|
James Cook
2016/08/05 17:00:24
Add class comment explaining what this does and wh
yiyix
2016/08/13 05:28:51
Done.
|
| public: |
| - explicit TrayDisplay(SystemTray* system_tray); |
| - ~TrayDisplay() override; |
| + explicit ScreenLayoutObserver(); |
|
James Cook
2016/08/05 17:00:24
no explicit
yiyix
2016/08/13 05:28:51
Done.
|
| + ~ScreenLayoutObserver() override; |
| // Overridden from WmDisplayObserver: |
| void OnDisplayConfigurationChanged() override; |
| private: |
| - friend class TrayDisplayTest; |
| + friend class ScreenLayoutObserverTest; |
| typedef std::map<int64_t, DisplayInfo> DisplayInfoMap; |
| @@ -54,23 +54,11 @@ class ASH_EXPORT TrayDisplay : public SystemTrayItem, public WmDisplayObserver { |
| void CreateOrUpdateNotification(const base::string16& message, |
| const base::string16& additional_message); |
| - // Overridden from SystemTrayItem. |
| - views::View* CreateDefaultView(LoginStatus status) override; |
| - void DestroyDefaultView() override; |
| - |
| - // Test accessors. |
| - base::string16 GetDefaultViewMessage() const; |
| - bool GetAccessibleStateForTesting(ui::AXViewState* state); |
| - const views::View* default_view() const { |
| - return reinterpret_cast<views::View*>(default_); |
| - } |
| - |
| - DisplayView* default_; |
| DisplayInfoMap display_info_; |
| - DISALLOW_COPY_AND_ASSIGN(TrayDisplay); |
| + DISALLOW_COPY_AND_ASSIGN(ScreenLayoutObserver); |
|
James Cook
2016/08/05 17:00:24
I like that you renamed to class to better represe
yiyix
2016/08/13 05:28:51
Thanks!
|
| }; |
| } // namespace ash |
| -#endif // ASH_SYSTEM_CHROMEOS_TRAY_DISPLAY_H_ |
| +#endif // ASH_SYSTEM_CHROMEOS_SCREEN_LAYOUT_OBSERVER_H_ |