ash/shelf/overflow_bubble.cc - Issue 2099603002: Reland: mash: Convert TrayBackgroundView to wm common types

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ash/shelf/overflow_bubble.cc

Issue 2099603002: Reland: mash: Convert TrayBackgroundView to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix conflict 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

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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 #include "ash/shelf/overflow_bubble.h"	5 #include "ash/shelf/overflow_bubble.h"

6	6

	7 #include "ash/common/system/tray/tray_background_view.h"

7 #include "ash/shelf/overflow_bubble_view.h"	8 #include "ash/shelf/overflow_bubble_view.h"

8 #include "ash/shelf/shelf.h"	9 #include "ash/shelf/shelf.h"

9 #include "ash/shelf/shelf_view.h"	10 #include "ash/shelf/shelf_view.h"

10 #include "ash/shelf/shelf_widget.h"	11 #include "ash/shelf/shelf_widget.h"

11 #include "ash/shell.h"	12 #include "ash/shell.h"

12 #include "ash/system/tray/tray_background_view.h"

13 #include "ui/events/event.h"	13 #include "ui/events/event.h"

14 #include "ui/views/widget/widget.h"	14 #include "ui/views/widget/widget.h"

15	15

16 namespace ash {	16 namespace ash {

17	17

18 OverflowBubble::OverflowBubble()	18 OverflowBubble::OverflowBubble()

19 : bubble_(NULL),	19 : bubble_(NULL),

20 anchor_(NULL),	20 anchor_(NULL),

21 shelf_view_(NULL) {	21 shelf_view_(NULL) {

22 Shell::GetInstance()->AddPointerWatcher(this);	22 Shell::GetInstance()->AddPointerWatcher(this);

(...skipping 62 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
85	85

86 void OverflowBubble::OnWidgetDestroying(views::Widget* widget) {	86 void OverflowBubble::OnWidgetDestroying(views::Widget* widget) {

87 DCHECK(widget == bubble_->GetWidget());	87 DCHECK(widget == bubble_->GetWidget());

88 bubble_ = NULL;	88 bubble_ = NULL;

89 anchor_ = NULL;	89 anchor_ = NULL;

90 shelf_view_->shelf()->SchedulePaint();	90 shelf_view_->shelf()->SchedulePaint();

91 shelf_view_ = NULL;	91 shelf_view_ = NULL;

92 }	92 }

93	93

94 } // namespace ash	94 } // namespace ash

OLD	NEW

« no previous file with comments | « ash/common/system/tray/tray_event_filter.cc ('k') | ash/system/chromeos/network/tray_sms.cc » ('j') | no next file with comments »