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

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

Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1 (Closed)
Patch Set: rebase Created 3 years, 9 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/common/shelf/app_list_button.cc ('k') | ash/common/shelf/shelf_layout_manager.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 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/common/shelf/overflow_bubble.h" 5 #include "ash/common/shelf/overflow_bubble.h"
6 6
7 #include "ash/common/shelf/overflow_bubble_view.h" 7 #include "ash/common/shelf/overflow_bubble_view.h"
8 #include "ash/common/shelf/overflow_button.h" 8 #include "ash/common/shelf/overflow_button.h"
9 #include "ash/common/shelf/shelf_view.h" 9 #include "ash/common/shelf/shelf_view.h"
10 #include "ash/common/shelf/wm_shelf.h" 10 #include "ash/common/shelf/wm_shelf.h"
11 #include "ash/common/system/tray/tray_background_view.h"
12 #include "ash/common/wm_shell.h" 11 #include "ash/common/wm_shell.h"
12 #include "ash/system/tray/tray_background_view.h"
13 #include "ui/gfx/geometry/rect.h" 13 #include "ui/gfx/geometry/rect.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(WmShelf* wm_shelf) 18 OverflowBubble::OverflowBubble(WmShelf* wm_shelf)
19 : wm_shelf_(wm_shelf), 19 : wm_shelf_(wm_shelf),
20 bubble_(nullptr), 20 bubble_(nullptr),
21 overflow_button_(nullptr), 21 overflow_button_(nullptr),
22 shelf_view_(nullptr) { 22 shelf_view_(nullptr) {
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 void OverflowBubble::OnWidgetDestroying(views::Widget* widget) { 85 void OverflowBubble::OnWidgetDestroying(views::Widget* widget) {
86 DCHECK(widget == bubble_->GetWidget()); 86 DCHECK(widget == bubble_->GetWidget());
87 // Update the overflow button in the parent ShelfView. 87 // Update the overflow button in the parent ShelfView.
88 overflow_button_->SchedulePaint(); 88 overflow_button_->SchedulePaint();
89 bubble_ = nullptr; 89 bubble_ = nullptr;
90 overflow_button_ = nullptr; 90 overflow_button_ = nullptr;
91 shelf_view_ = nullptr; 91 shelf_view_ = nullptr;
92 } 92 }
93 93
94 } // namespace ash 94 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/shelf/app_list_button.cc ('k') | ash/common/shelf/shelf_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698