ash/common/shelf/shelf_window_watcher_item_delegate.cc - Issue 2211463002: mash: Move ShelfWindowWatcher[ItemDelegate] to ash/common.

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/common/shelf/shelf_window_watcher_item_delegate.cc

Issue 2211463002: mash: Move ShelfWindowWatcher[ItemDelegate] to ash/common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Move ShelfWindowWatcher to WmShell. Created 4 years, 4 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/shelf_window_watcher_item_delegate.h"	5 #include "ash/common/shelf/shelf_window_watcher_item_delegate.h"

6	6

	7 #include "ash/common/shelf/shelf_item_types.h"

7 #include "ash/common/wm/window_state.h"	8 #include "ash/common/wm/window_state.h"

8 #include "ash/common/wm_window.h"	9 #include "ash/common/wm_window.h"

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

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

11 #include "ui/wm/core/window_animations.h"

12	11

13 namespace ash {	12 namespace ash {

14	13

15 ShelfWindowWatcherItemDelegate::ShelfWindowWatcherItemDelegate(WmWindow* window)	14 ShelfWindowWatcherItemDelegate::ShelfWindowWatcherItemDelegate(WmWindow* window)

16 : window_(window) {}	15 : window_(window) {}

17	16

18 ShelfWindowWatcherItemDelegate::~ShelfWindowWatcherItemDelegate() {}	17 ShelfWindowWatcherItemDelegate::~ShelfWindowWatcherItemDelegate() {}

19	18

20 ShelfItemDelegate::PerformedAction ShelfWindowWatcherItemDelegate::ItemSelected(	19 ShelfItemDelegate::PerformedAction ShelfWindowWatcherItemDelegate::ItemSelected(

21 const ui::Event& event) {	20 const ui::Event& event) {

(...skipping 31 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
53	52

54 bool ShelfWindowWatcherItemDelegate::ShouldShowTooltip() {	53 bool ShelfWindowWatcherItemDelegate::ShouldShowTooltip() {

55 return true;	54 return true;

56 }	55 }

57	56

58 void ShelfWindowWatcherItemDelegate::Close() {	57 void ShelfWindowWatcherItemDelegate::Close() {

59 window_->CloseWidget();	58 window_->CloseWidget();

60 }	59 }

61	60

62 } // namespace ash	61 } // namespace ash

OLD	NEW