| 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 |
|---|
Chromium Code Reviews
Issue 2211463002:
mash: Move ShelfWindowWatcher[ItemDelegate] to ash/common. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master