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

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

Issue 2095193002: clang-format all of //ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
« 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 <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 // Scans the current display info and updates |display_info_|. Sets the 43 // Scans the current display info and updates |display_info_|. Sets the
44 // previous data to |old_info| if it's not NULL. 44 // previous data to |old_info| if it's not NULL.
45 void UpdateDisplayInfo(DisplayInfoMap* old_info); 45 void UpdateDisplayInfo(DisplayInfoMap* old_info);
46 46
47 // Compares the current display settings with |old_info| and determine what 47 // Compares the current display settings with |old_info| and determine what
48 // message should be shown for notification. Returns true if there's a 48 // message should be shown for notification. Returns true if there's a
49 // meaningful change. Note that it's possible to return true and set 49 // meaningful change. Note that it's possible to return true and set
50 // |message_out| to empty, which means the notification should be removed. It 50 // |message_out| to empty, which means the notification should be removed. It
51 // also sets |additional_message_out| which appears in the notification with 51 // also sets |additional_message_out| which appears in the notification with
52 // the |message_out|. 52 // the |message_out|.
53 bool GetDisplayMessageForNotification( 53 bool GetDisplayMessageForNotification(const DisplayInfoMap& old_info,
54 const DisplayInfoMap& old_info, 54 base::string16* message_out,
55 base::string16* message_out, 55 base::string16* additional_message_out);
56 base::string16* additional_message_out);
57 56
58 // Creates or updates the display notification. 57 // Creates or updates the display notification.
59 void CreateOrUpdateNotification(const base::string16& message, 58 void CreateOrUpdateNotification(const base::string16& message,
60 const base::string16& additional_message); 59 const base::string16& additional_message);
61 60
62 // Overridden from SystemTrayItem. 61 // Overridden from SystemTrayItem.
63 views::View* CreateDefaultView(LoginStatus status) override; 62 views::View* CreateDefaultView(LoginStatus status) override;
64 void DestroyDefaultView() override; 63 void DestroyDefaultView() override;
65 64
66 // Test accessors. 65 // Test accessors.
67 base::string16 GetDefaultViewMessage() const; 66 base::string16 GetDefaultViewMessage() const;
68 bool GetAccessibleStateForTesting(ui::AXViewState* state); 67 bool GetAccessibleStateForTesting(ui::AXViewState* state);
69 const views::View* default_view() const { 68 const views::View* default_view() const {
70 return reinterpret_cast<views::View*>(default_); 69 return reinterpret_cast<views::View*>(default_);
71 } 70 }
72 71
73 DisplayView* default_; 72 DisplayView* default_;
74 DisplayInfoMap display_info_; 73 DisplayInfoMap display_info_;
75 74
76 DISALLOW_COPY_AND_ASSIGN(TrayDisplay); 75 DISALLOW_COPY_AND_ASSIGN(TrayDisplay);
77 }; 76 };
78 77
79 } // namespace ash 78 } // namespace ash
80 79
81 #endif // ASH_SYSTEM_CHROMEOS_TRAY_DISPLAY_H_ 80 #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