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

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

Issue 2091933002: mash: Convert TrayBackgroundView to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tweak 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
OLDNEW
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
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
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698