ash/shelf/overflow_bubble.cc - Issue 115113006: Rename Launcher to Shelf.

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 115113006: Rename Launcher to Shelf. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: more fixes Created 7 years 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 | Annotate | Revision Log

« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/shelf/overflow_bubble_view.h » ('j') | no next file with comments »

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/root_window_controller.h"	7 #include "ash/root_window_controller.h"

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

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

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

(...skipping 78 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
89 void OverflowBubble::OnTouchEvent(ui::TouchEvent* event) {	89 void OverflowBubble::OnTouchEvent(ui::TouchEvent* event) {

90 if (event->type() == ui::ET_TOUCH_PRESSED)	90 if (event->type() == ui::ET_TOUCH_PRESSED)

91 ProcessPressedEvent(event);	91 ProcessPressedEvent(event);

92 }	92 }

93	93

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

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

96 bubble_ = NULL;	96 bubble_ = NULL;

97 anchor_ = NULL;	97 anchor_ = NULL;

98 shelf_view_ = NULL;	98 shelf_view_ = NULL;

99 ShelfLayoutManager::ForLauncher(	99 ShelfLayoutManager::ForShelf(

100 widget->GetNativeView())->shelf_widget()->launcher()->SchedulePaint();	100 widget->GetNativeView())->shelf_widget()->shelf()->SchedulePaint();

101 }	101 }

102	102

103 } // namespace internal	103 } // namespace internal

104 } // namespace ash	104 } // namespace ash

OLD	NEW