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

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

Issue 2400553002: ash: Remove broken display notification suppression when settings is open (Closed)
Patch Set: fix tests Created 4 years, 2 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
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_SCREEN_LAYOUT_OBSERVER_H_ 5 #ifndef ASH_SYSTEM_CHROMEOS_SCREEN_LAYOUT_OBSERVER_H_
6 #define ASH_SYSTEM_CHROMEOS_SCREEN_LAYOUT_OBSERVER_H_ 6 #define ASH_SYSTEM_CHROMEOS_SCREEN_LAYOUT_OBSERVER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 11 matching lines...) Expand all
22 // ScreenLayoutObserver is responsible to send notification to users when screen 22 // ScreenLayoutObserver is responsible to send notification to users when screen
23 // resolution changes or screen rotation changes. 23 // resolution changes or screen rotation changes.
24 class ASH_EXPORT ScreenLayoutObserver : public WmDisplayObserver { 24 class ASH_EXPORT ScreenLayoutObserver : public WmDisplayObserver {
25 public: 25 public:
26 ScreenLayoutObserver(); 26 ScreenLayoutObserver();
27 ~ScreenLayoutObserver() override; 27 ~ScreenLayoutObserver() override;
28 28
29 // Overridden from WmDisplayObserver: 29 // Overridden from WmDisplayObserver:
30 void OnDisplayConfigurationChanged() override; 30 void OnDisplayConfigurationChanged() override;
31 31
32 static void SuppressNotificationsForTesting(bool suppress);
33
32 private: 34 private:
33 friend class ScreenLayoutObserverTest; 35 friend class ScreenLayoutObserverTest;
34 36
35 using DisplayInfoMap = std::map<int64_t, display::ManagedDisplayInfo>; 37 using DisplayInfoMap = std::map<int64_t, display::ManagedDisplayInfo>;
36 38
37 static const char kNotificationId[]; 39 static const char kNotificationId[];
38 40
39 // Scans the current display info and updates |display_info_|. Sets the 41 // Scans the current display info and updates |display_info_|. Sets the
40 // previous data to |old_info| if it's not NULL. 42 // previous data to |old_info| if it's not NULL.
41 void UpdateDisplayInfo(DisplayInfoMap* old_info); 43 void UpdateDisplayInfo(DisplayInfoMap* old_info);
(...skipping 13 matching lines...) Expand all
55 const base::string16& additional_message); 57 const base::string16& additional_message);
56 58
57 DisplayInfoMap display_info_; 59 DisplayInfoMap display_info_;
58 60
59 DISALLOW_COPY_AND_ASSIGN(ScreenLayoutObserver); 61 DISALLOW_COPY_AND_ASSIGN(ScreenLayoutObserver);
60 }; 62 };
61 63
62 } // namespace ash 64 } // namespace ash
63 65
64 #endif // ASH_SYSTEM_CHROMEOS_SCREEN_LAYOUT_OBSERVER_H_ 66 #endif // ASH_SYSTEM_CHROMEOS_SCREEN_LAYOUT_OBSERVER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698