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

Side by Side Diff: ash/common/system/web_notification/ash_popup_alignment_delegate.h

Issue 2472233002: Fix a bug of PopupAlignmentDelegate on non-primary display (Closed)
Patch Set: Addressed comment: returning a rect instead of top Created 4 years, 1 month 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 | « no previous file | ash/common/system/web_notification/ash_popup_alignment_delegate.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_COMMON_SYSTEM_WEB_NOTIFICATION_ASH_POPUP_ALIGNMENT_DELEGATE_H_ 5 #ifndef ASH_COMMON_SYSTEM_WEB_NOTIFICATION_ASH_POPUP_ALIGNMENT_DELEGATE_H_
6 #define ASH_COMMON_SYSTEM_WEB_NOTIFICATION_ASH_POPUP_ALIGNMENT_DELEGATE_H_ 6 #define ASH_COMMON_SYSTEM_WEB_NOTIFICATION_ASH_POPUP_ALIGNMENT_DELEGATE_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 // Sets the current height of the system tray bubble (or legacy notification 44 // Sets the current height of the system tray bubble (or legacy notification
45 // bubble) so that web notification toasts can avoid it. 45 // bubble) so that web notification toasts can avoid it.
46 void SetTrayBubbleHeight(int height); 46 void SetTrayBubbleHeight(int height);
47 47
48 // Returns the current tray bubble height or 0 if there is no bubble. 48 // Returns the current tray bubble height or 0 if there is no bubble.
49 int tray_bubble_height_for_test() const { return tray_bubble_height_; } 49 int tray_bubble_height_for_test() const { return tray_bubble_height_; }
50 50
51 // Overridden from message_center::PopupAlignmentDelegate: 51 // Overridden from message_center::PopupAlignmentDelegate:
52 int GetToastOriginX(const gfx::Rect& toast_bounds) const override; 52 int GetToastOriginX(const gfx::Rect& toast_bounds) const override;
53 int GetBaseLine() const override; 53 int GetBaseLine() const override;
54 int GetWorkAreaBottom() const override; 54 gfx::Rect GetWorkArea() const override;
55 bool IsTopDown() const override; 55 bool IsTopDown() const override;
56 bool IsFromLeft() const override; 56 bool IsFromLeft() const override;
57 void RecomputeAlignment(const display::Display& display) override; 57 void RecomputeAlignment(const display::Display& display) override;
58 void ConfigureWidgetInitParamsForContainer( 58 void ConfigureWidgetInitParamsForContainer(
59 views::Widget* widget, 59 views::Widget* widget,
60 views::Widget::InitParams* init_params) override; 60 views::Widget::InitParams* init_params) override;
61 61
62 private: 62 private:
63 friend class AshPopupAlignmentDelegateTest; 63 friend class AshPopupAlignmentDelegateTest;
64 friend class WebNotificationTrayTest; 64 friend class WebNotificationTrayTest;
(...skipping 21 matching lines...) Expand all
86 gfx::Rect work_area_; 86 gfx::Rect work_area_;
87 WmShelf* shelf_; 87 WmShelf* shelf_;
88 int tray_bubble_height_; 88 int tray_bubble_height_;
89 89
90 DISALLOW_COPY_AND_ASSIGN(AshPopupAlignmentDelegate); 90 DISALLOW_COPY_AND_ASSIGN(AshPopupAlignmentDelegate);
91 }; 91 };
92 92
93 } // namespace ash 93 } // namespace ash
94 94
95 #endif // ASH_COMMON_SYSTEM_WEB_NOTIFICATION_ASH_POPUP_ALIGNMENT_DELEGATE_H_ 95 #endif // ASH_COMMON_SYSTEM_WEB_NOTIFICATION_ASH_POPUP_ALIGNMENT_DELEGATE_H_
OLDNEW
« no previous file with comments | « no previous file | ash/common/system/web_notification/ash_popup_alignment_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698