ash/shelf/overflow_bubble.cc - Issue 23534023: ash: Minor cleanup, move more files from 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 23534023: ash: Minor cleanup, move more files from launcher to shelf. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

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

6	6

7 #include <algorithm>	7 #include <algorithm>

8	8

9 #include "ash/launcher/launcher_types.h"	9 #include "ash/launcher/launcher_types.h"

10 #include "ash/launcher/launcher_view.h"	10 #include "ash/launcher/launcher_view.h"

11 #include "ash/root_window_controller.h"	11 #include "ash/root_window_controller.h"

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

13 #include "ash/shelf/shelf_widget.h"	13 #include "ash/shelf/shelf_widget.h"

14 #include "ash/shell.h"	14 #include "ash/shell.h"

15 #include "ash/system/tray/system_tray.h"	15 #include "ash/system/tray/system_tray.h"

(...skipping 260 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
276 void OverflowBubble::OnWidgetDestroying(views::Widget* widget) {	276 void OverflowBubble::OnWidgetDestroying(views::Widget* widget) {

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

278 bubble_ = NULL;	278 bubble_ = NULL;

279 launcher_view_ = NULL;	279 launcher_view_ = NULL;

280 ShelfLayoutManager::ForLauncher(	280 ShelfLayoutManager::ForLauncher(

281 widget->GetNativeView())->shelf_widget()->launcher()->SchedulePaint();	281 widget->GetNativeView())->shelf_widget()->launcher()->SchedulePaint();

282 }	282 }

283	283

284 } // namespace internal	284 } // namespace internal

285 } // namespace ash	285 } // namespace ash

OLD	NEW

« no previous file with comments | « ash/shelf/overflow_bubble.h ('k') | ash/shelf/overflow_button.h » ('j') | no next file with comments »